Skip to content

fix updating #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DuckySoLucky merged 1 commit into from
Apr 13, 2025
+14 −6
Merged

fix updating #340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/discord/commands/updateCommand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ async function updateRoles({ discordId, uuid }) {

const verificationRoles = config.verification.roles;
const roles = [verificationRoles.guildMember.roleId, ...verificationRoles.custom.flatMap((r) => r.roleId)];
for (const role of roles) {
if (member.roles.cache.has(role)) {
await member.roles.remove(role, "Updated Roles");
// console.log(`Removed ${(await guild.roles.fetch(role)).name}`);
}
}
const addedRoles = [];

if (!uuid) {
member.setNickname(null, "Updated Roles");
Expand All @@ -43,6 +38,7 @@ async function updateRoles({ discordId, uuid }) {

if (verificationRoles.verified.enabled) {
await member.roles.add(verificationRoles.verified.roleId, "Updated Roles");
addedRoles.push(verificationRoles.verified.roleId);
// console.log("Added verified role");
}

Expand Down Expand Up @@ -74,6 +70,7 @@ async function updateRoles({ discordId, uuid }) {
if (guildMember) {
if (verificationRoles.guildMember.enabled) {
await member.roles.add(verificationRoles.guildMember.roleId, "Updated Roles");
addedRoles.push(verificationRoles.guildMember.roleId);
// console.log("Added guild member role");
}

Expand All @@ -85,6 +82,8 @@ async function updateRoles({ discordId, uuid }) {
);
if (guildRank && guildRank.enabled !== false) {
await member.roles.add(guildRank.roleId, "Updated Roles");
addedRoles.push(guildRank.roleId);

// console.log(`Added ${(await guild.roles.fetch(guildRank.roleId)).name}`);
}
} else {
Expand Down Expand Up @@ -289,6 +288,7 @@ async function updateRoles({ discordId, uuid }) {
const meetsRequirements = role.requirements.every((req) => req.value <= stats[req.type]);
if (meetsRequirements) {
await member.roles.add(role.roleId, "Updated Roles");
addedRoles.push(role.roleId);
// console.log(
// `Added ${(await guild.roles.fetch(role.roleId)).name} cuz he meets the requirements for ${role.requirements.map((req) => `${req.type} >= ${req.value}`).join(" and ")}`
// );
Expand All @@ -303,6 +303,14 @@ async function updateRoles({ discordId, uuid }) {
),
"Updated Roles"
);

for (const role of roles) {
if (addedRoles.includes(role)) return;
if (member.roles.cache.has(role)) {
await member.roles.remove(role, "Updated Roles");
// console.log(`Removed ${(await guild.roles.fetch(role)).name}`);
}
}
}

module.exports = {
Expand Down
Loading