fix unlock

89Q12 · Feb 3, 2024 · f520db4 · f520db4
1 parent 50c9ca6
commit f520db4
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/backend/src/guild/events/guild-members/index.ts b/backend/src/guild/events/guild-members/index.ts
@@ -55,9 +55,13 @@ export class GuildMemberEvents {
 
   @On('messageReactionAdd')
   async unlockUser(reaction: MessageReaction, userReacted: User) {
-    if (reaction.message.channelId != '1121822614374060175') return;
     if (
-      ['MOD', 'ADMIN', 'OWNER'].includes(
+      reaction.message.channelId ==
+      (await this.settingsService.getIntroChannelId(reaction.message.guildId))
+    )
+      return;
+    if (
+      !['MOD', 'ADMIN', 'OWNER'].includes(
         (
           await this.guildUserService.getGuildUser(
             userReacted.id,
@@ -76,10 +80,6 @@ export class GuildMemberEvents {
     }
     const user = reaction.message.author;
     if (
-      reaction.message.channelId ==
-        (await this.settingsService.getIntroChannelId(
-          reaction.message.guildId,
-        )) &&
       (
         await this.guildUserService.getGuildUser(
           reaction.message.author.id,
@@ -95,21 +95,22 @@ export class GuildMemberEvents {
         await this.client.guilds.fetch(reaction.message.guildId)
       ).members.fetch(user.id);
       try {
-        member.roles.add(
+        await member.roles.add(
           await this.settingsService.getVerifiedMemberRoleId(
             reaction.message.guildId,
           ),
         );
         // Wait 500ms to make sure the role is added before removing the unverified role
         //https://github.com/discordjs/discord.js/issues/4930#issuecomment-1042351896
         await new Promise((resolve) => setTimeout(resolve, 500));
-        member.roles.remove(
+        await member.roles.remove(
           await this.settingsService.getUnverifiedMemberRoleId(
             reaction.message.guildId,
           ),
         );
       } catch (e) {
         this.logger.error(e);
+        return;
       }
       const channel = (await reaction.message.guild.channels.fetch(
         await this.settingsService.getOpenIntroChannelId(