role changeで前後のロールが同じの場合のバグを修正

minarin0179 · Aug 5, 2023 · 0cd09c2 · 0cd09c2
1 parent c938511
commit 0cd09c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/commands/slashcommands/role.ts b/src/commands/slashcommands/role.ts
@@ -107,6 +107,7 @@ export default new SlashCommand({
                 });
                 break;
             case "change":
+                if (roleAdd == roleRemove) return reply(interaction, "変更前と変更後のロールが同じです");
                 await reply(interaction, {
                     components: buttonToRow(roleChangeButton.build({ before: roleRemove, after: roleAdd })),
                     ephemeral,

diff --git a/src/components/buttons/roleChange.ts b/src/components/buttons/roleChange.ts
@@ -23,12 +23,10 @@ export default new Button({
         const { members } = before;
         if (members.size === 0) return reply(interaction, `${before}を持つメンバーがいません`);
 
-        await Promise.all(
-            members.map(async member => {
-                await member.roles.add(after);
-                await member.roles.remove(before);
-            })
-        );
+        await Promise.all([
+            ...members.map(async member => await member.roles.add(after)),
+            ...members.map(async member => await member.roles.remove(before)),
+        ]);
 
         await reply(interaction, `${[...members.values()].join(", ")}の${before}を${after}に変更しました`);
     },