diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts index 57dc3c3..a63b435 100644 --- a/src/commands-contextmenu/updateuser.ts +++ b/src/commands-contextmenu/updateuser.ts @@ -135,7 +135,9 @@ export = { replyRank = "Member" } - await user.roles.remove(waitingListRole) + if (user.roles.cache.has(waitingListRole)) { + await user.roles.remove(waitingListRole, "User was force updated.") + } await interaction.editReply({ embeds: [{ diff --git a/src/commands/forceupdate.ts b/src/commands/forceupdate.ts index 45ad37c..f623532 100644 --- a/src/commands/forceupdate.ts +++ b/src/commands/forceupdate.ts @@ -141,7 +141,9 @@ export = { replyRank = "Member" } - await user.roles.remove(waitingListRole) + if (user.roles.cache.has(waitingListRole)) { + await user.roles.remove(waitingListRole, "User was force updated.") + } await interaction.editReply({ embeds: [{ diff --git a/src/commands/staff.ts b/src/commands/staff.ts index a24b1a3..4f3c621 100644 --- a/src/commands/staff.ts +++ b/src/commands/staff.ts @@ -41,7 +41,7 @@ export = { .addSubcommand(subcommand => subcommand .setName("removeguildroles") - .setDescription("Update the discord roles of all guild members") + .setDescription("Remove guild roles from non members") ) .addSubcommand(subcommand => subcommand diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts index 9d1154c..9fd822f 100644 --- a/src/commands/staff/updateall.ts +++ b/src/commands/staff/updateall.ts @@ -72,7 +72,7 @@ export default async function updateAll(interaction: ChatInputCommandInteraction await gmember.member.roles.remove(rolesToremove, "Updating all discord members") continue } else { - await gmember.member.roles.add(verifyTick) + await gmember.member.roles.add(verifyTick, "Updating all discord members") console.log(color(" Added verified tick to " + gmember.member.user.username, "lavender")) } diff --git a/src/commands/update.ts b/src/commands/update.ts index d9141a3..2b97eb2 100644 --- a/src/commands/update.ts +++ b/src/commands/update.ts @@ -124,7 +124,9 @@ export = { replyRank = "Member" } - await user.roles.remove(waitingListRole) + if (user.roles.cache.has(waitingListRole)) { + await user.roles.remove(waitingListRole, "User used the update command") + } await interaction.editReply({ embeds: [{