refactor: use addRoleToUser utility for role assignment

Author: wiktoriavh

src/commands/onboarding/index.ts

@@ -1,5 +1,6 @@
 import { ApplicationCommandType, MessageFlags } from 'discord.js';
 import { config } from '../../env.js';
+import { addRoleToUser } from '../../util/addRoleToUser.js';
 import { createCommand } from '../../util/commands.js';
 import { containerComponent } from './component.js';
 
@@ -46,19 +47,7 @@ export const onboardingCommand = createCommand({
     collector.on('collect', async (componentInteraction) => {
       if (componentInteraction.customId === 'onboarding_add_role') {
         const member = await guild.members.fetch(componentInteraction.user.id);
-        const hasRole = member.roles.cache.has(onboardingRole.id);
-        if (hasRole) {
-          await componentInteraction.reply({
-            content: `You already have the ${onboardingRole.name} role.`,
-            flags: MessageFlags.Ephemeral,
-          });
-        } else {
-          await member.roles.add(onboardingRole);
-          await componentInteraction.reply({
-            content: `You have been given the ${onboardingRole.name} role!`,
-            flags: MessageFlags.Ephemeral,
-          });
-        }
+        await addRoleToUser(member, onboardingRole, componentInteraction);
       }
     });
   },

src/util/addRoleToUser.ts

@@ -0,0 +1,40 @@
+import {
+  type ButtonInteraction,
+  type CacheType,
+  type ChannelSelectMenuInteraction,
+  type GuildMember,
+  type MentionableSelectMenuInteraction,
+  MessageFlags,
+  type Role,
+  type RoleSelectMenuInteraction,
+  type StringSelectMenuInteraction,
+  type UserSelectMenuInteraction,
+} from 'discord.js';
+
+type ComponentInteraction =
+  | ButtonInteraction<CacheType>
+  | StringSelectMenuInteraction<CacheType>
+  | UserSelectMenuInteraction<CacheType>
+  | RoleSelectMenuInteraction<CacheType>
+  | MentionableSelectMenuInteraction<CacheType>
+  | ChannelSelectMenuInteraction<CacheType>;
+
+export async function addRoleToUser(
+  member: GuildMember,
+  role: Role,
+  interaction: ComponentInteraction
+) {
+  const hasRole = member.roles.cache.has(role.id);
+  if (hasRole) {
+    await interaction.reply({
+      content: `You already have the ${role.name} role.`,
+      flags: MessageFlags.Ephemeral,
+    });
+  } else {
+    await member.roles.add(role);
+    await interaction.reply({
+      content: `You have been given the ${role.name} role!`,
+      flags: MessageFlags.Ephemeral,
+    });
+  }
+}