fix: resolve TypeScript compilation errors

src/bot.ts

@@ -1,11 +1,13 @@
-import {Client, Collection, User} from 'discord.js';
+import {Client, Collection, User, GuildMember, PartialGuildMember} from 'discord.js';
 import {inject, injectable} from 'inversify';
 import ora from 'ora';
 import {TYPES} from './types.js';
 import container from './inversify.config.js';
 import Command from './commands/index.js';
 import debug from './utils/debug.js';
 import handleGuildCreate from './events/guild-create.js';
+import handleGuildMemberAdd from './events/guild-member-add.js';
+import handleGuildMemberRemove from './events/guild-member-remove.js';
 import handleVoiceStateUpdate from './events/voice-state-update.js';
 import errorMsg from './utils/error-msg.js';
 import {isUserInVoice} from './utils/channels.js';
@@ -162,6 +164,8 @@
     this.client.on('debug', debug);
 
     this.client.on('guildCreate', handleGuildCreate);
+    this.client.on('guildMemberAdd', handleGuildMemberAdd);
+    this.client.on('guildMemberRemove', (member: GuildMember | PartialGuildMember) => handleGuildMemberRemove(member));
     this.client.on('voiceStateUpdate', handleVoiceStateUpdate);
     await this.client.login();
   }

src/commands/config.ts

@@ -1,5 +1,5 @@
 import {SlashCommandBuilder} from '@discordjs/builders';
-import {ChatInputCommandInteraction, EmbedBuilder, PermissionFlagsBits} from 'discord.js';
+import {ChannelType, ChatInputCommandInteraction, EmbedBuilder, PermissionFlagsBits} from 'discord.js';
 import {injectable} from 'inversify';
 import {prisma} from '../utils/db.js';
 import Command from './index.js';
@@ -81,11 +81,49 @@
         .setMinValue(1)
         .setMaxValue(30)
         .setRequired(true)))
+    .addSubcommand(subcommand => subcommand
+      .setName('set-welcome-channel')
+      .setDescription('set where welcome messages are posted')
+      .addChannelOption(option => option
+        .setName('channel')
+        .setDescription('welcome channel')
+        .addChannelTypes([ChannelType.GuildText])
+        .setRequired(true)))
+    .addSubcommand(subcommand => subcommand
+      .setName('clear-welcome-channel')
+      .setDescription('turn off welcome messages'))
+    .addSubcommand(subcommand => subcommand
+      .setName('set-welcome-message')
+      .setDescription('set the welcome message. Supports {user}, {username}, {server}, {memberCount}')
+      .addStringOption(option => option
+        .setName('message')
+        .setDescription('message template')
+        .setMaxLength(500)
+        .setRequired(true)))
+    .addSubcommand(subcommand => subcommand
+      .setName('set-leave-channel')
+      .setDescription('set where leave messages are posted')
+      .addChannelOption(option => option
+        .setName('channel')
+        .setDescription('leave channel')
+        .addChannelTypes([ChannelType.GuildText])
+        .setRequired(true)))
+    .addSubcommand(subcommand => subcommand
+      .setName('clear-leave-channel')
+      .setDescription('turn off leave messages'))
+    .addSubcommand(subcommand => subcommand
+      .setName('set-leave-message')
+      .setDescription('set the leave message. Supports {user}, {username}, {server}, {memberCount}')
+      .addStringOption(option => option
+        .setName('message')
+        .setDescription('message template')
+        .setMaxLength(500)
+        .setRequired(true)))
     .addSubcommand(subcommand => subcommand
       .setName('get')
       .setDescription('show all settings'));
 
   async execute(interaction: ChatInputCommandInteraction) {
     // Ensure guild settings exist before trying to update
     await getGuildSettings(interaction.guild!.id);
 
@@ -213,6 +251,104 @@
         break;
       }
 
+      case 'set-welcome-channel': {
+        const channel = interaction.options.getChannel('channel', true);
+
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            welcomeChannelId: channel.id,
+          },
+        });
+
+        await interaction.reply(`welcome messages will go to <#${channel.id}>`);
+
+        break;
+      }
+
+      case 'clear-welcome-channel': {
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            welcomeChannelId: null,
+          },
+        });
+
+        await interaction.reply('welcome messages disabled');
+
+        break;
+      }
+
+      case 'set-welcome-message': {
+        const message = interaction.options.getString('message', true);
+
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            welcomeMessage: message,
+          },
+        });
+
+        await interaction.reply('welcome message updated');
+
+        break;
+      }
+
+      case 'set-leave-channel': {
+        const channel = interaction.options.getChannel('channel', true);
+
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            leaveChannelId: channel.id,
+          },
+        });
+
+        await interaction.reply(`leave messages will go to <#${channel.id}>`);
+
+        break;
+      }
+
+      case 'clear-leave-channel': {
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            leaveChannelId: null,
+          },
+        });
+
+        await interaction.reply('leave messages disabled');
+
+        break;
+      }
+
+      case 'set-leave-message': {
+        const message = interaction.options.getString('message', true);
+
+        await prisma.setting.update({
+          where: {
+            guildId: interaction.guild!.id,
+          },
+          data: {
+            leaveMessage: message,
+          },
+        });
+
+        await interaction.reply('leave message updated');
+
+        break;
+      }
+
       case 'set-reduce-vol-when-voice': {
         const value = interaction.options.getBoolean('value')!;
 
@@ -259,15 +395,19 @@
             : `${config.secondsToWaitAfterQueueEmpties}s`,
           'Leave if there are no listeners': config.leaveIfNoListeners ? 'yes' : 'no',
           'Auto announce next song in queue': config.autoAnnounceNextSong ? 'yes' : 'no',
-          'Add to queue reponses show for requester only': config.autoAnnounceNextSong ? 'yes' : 'no',
+          'Add to queue responses show for requester only': config.queueAddResponseEphemeral ? 'yes' : 'no',
           'Default Volume': config.defaultVolume,
           'Default queue page size': config.defaultQueuePageSize,
           'Reduce volume when people speak': config.turnDownVolumeWhenPeopleSpeak ? 'yes' : 'no',
+          'Welcome channel': config.welcomeChannelId ? `<#${config.welcomeChannelId}>` : 'disabled',
+          'Welcome message': config.welcomeMessage,
+          'Leave channel': config.leaveChannelId ? `<#${config.leaveChannelId}>` : 'disabled',
+          'Leave message': config.leaveMessage,
         };
 
         let description = '';
         for (const [key, value] of Object.entries(settingsToShow)) {
           description += `**${key}**: ${value}\n`;
         }
 
         embed.setDescription(description);

src/events/guild-member-remove.ts

@@ -0,0 +1,10 @@
+import {GuildMember, PartialGuildMember} from 'discord.js';
+import {getGuildSettings} from '../utils/get-guild-settings.js';
+import {formatMemberMessage, sendMemberMessage} from '../utils/member-messages.js';
+
+export default async function handleGuildMemberRemove(member: GuildMember | PartialGuildMember): Promise<void> {
+  const settings = await getGuildSettings(member.guild.id);
+  const message = formatMemberMessage(settings.leaveMessage, member);
+
+  await sendMemberMessage(settings.leaveChannelId, member, {content: message});
+}

src/utils/build-embed.ts

@@ -1,10 +1,21 @@
 import getYouTubeID from 'get-youtube-id';
-import {EmbedBuilder} from 'discord.js';
+import {ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder, APIActionRowComponent, APIMessageActionRowComponent} from 'discord.js';
 import Player, {MediaSource, QueuedSong, STATUS} from '../services/player.js';
 import getProgressBar from './get-progress-bar.js';
 import {prettyTime} from './time.js';
 import {truncate} from './string.js';
 
+export const MUSIC_BUTTON_IDS = {
+  replay: 'music:replay',
+  pauseResume: 'music:pause-resume',
+  skip: 'music:skip',
+  stop: 'music:stop',
+  loopSong: 'music:loop-song',
+  loopQueue: 'music:loop-queue',
+  shuffle: 'music:shuffle',
+  queue: 'music:queue',
+} as const;
+
 const getMaxSongTitleLength = (title: string) => {
   // eslint-disable-next-line no-control-regex
   const nonASCII = /[^\x00-\x7F]+/;
@@ -33,6 +44,18 @@ const getQueueInfo = (player: Player) => {
   return queueSize === 1 ? '1 song' : `${queueSize} songs`;
 };
 
+const getLoopLabel = (player: Player) => {
+  if (player.loopCurrentSong) {
+    return 'Song';
+  }
+
+  if (player.loopCurrentQueue) {
+    return 'Queue';
+  }
+
+  return 'Off';
+};
+
 const getPlayerUI = (player: Player) => {
   const song = player.getCurrent();
 
@@ -75,6 +98,45 @@ export const buildPlayingMessageEmbed = (player: Player): EmbedBuilder => {
   return message;
 };
 
+export const buildPlayerControlRows = (player: Player): Array<APIActionRowComponent<APIMessageActionRowComponent>> => [
+  new ActionRowBuilder<ButtonBuilder>().addComponents(
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.replay)
+      .setLabel('Restart')
+      .setStyle(ButtonStyle.Secondary),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.pauseResume)
+      .setLabel(player.status === STATUS.PLAYING ? 'Pause' : 'Resume')
+      .setStyle(player.status === STATUS.PLAYING ? ButtonStyle.Primary : ButtonStyle.Success),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.skip)
+      .setLabel('Skip')
+      .setStyle(ButtonStyle.Primary),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.stop)
+      .setLabel('Stop')
+      .setStyle(ButtonStyle.Danger),
+  ).toJSON() as APIActionRowComponent<APIMessageActionRowComponent>,
+  new ActionRowBuilder<ButtonBuilder>().addComponents(
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.loopSong)
+      .setLabel(`Repeat Song: ${player.loopCurrentSong ? 'On' : 'Off'}`)
+      .setStyle(player.loopCurrentSong ? ButtonStyle.Success : ButtonStyle.Secondary),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.loopQueue)
+      .setLabel(`Repeat Queue: ${player.loopCurrentQueue ? 'On' : 'Off'}`)
+      .setStyle(player.loopCurrentQueue ? ButtonStyle.Success : ButtonStyle.Secondary),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.shuffle)
+      .setLabel('Shuffle')
+      .setStyle(ButtonStyle.Secondary),
+    new ButtonBuilder()
+      .setCustomId(MUSIC_BUTTON_IDS.queue)
+      .setLabel('Queue')
+      .setStyle(ButtonStyle.Secondary),
+  ).toJSON() as APIActionRowComponent<APIMessageActionRowComponent>,
+];
+
 export const buildQueueEmbed = (player: Player, page: number, pageSize: number): EmbedBuilder => {
   const currentlyPlaying = player.getCurrent();
 
@@ -118,12 +180,12 @@ export const buildQueueEmbed = (player: Player, page: number, pageSize: number):
   }
 
   message
-    .setTitle(player.status === STATUS.PLAYING ? `Now Playing ${player.loopCurrentSong ? '(loop on)' : ''}` : 'Queued songs')
-    .setColor(player.status === STATUS.PLAYING ? 'DarkGreen' : 'NotQuiteBlack')
+    .setTitle(player.status === STATUS.PLAYING ? 'Now Playing' : 'Queued Songs')
+    .setColor(player.status === STATUS.PLAYING ? 0x00E5A8 : 0x5865F2)
     .setDescription(description)
     .addFields([{name: 'In queue', value: getQueueInfo(player), inline: true}, {
       name: 'Total length', value: `${totalLength > 0 ? prettyTime(totalLength) : '-'}`, inline: true,
-    }, {name: 'Page', value: `${page} out of ${maxQueuePage}`, inline: true}])
+    }, {name: 'Page', value: `${page} out of ${maxQueuePage}`, inline: true}, {name: 'Repeat', value: getLoopLabel(player), inline: true}])
     .setFooter({text: `Source: ${artist} ${playlistTitle}`});
 
   if (thumbnailUrl) {
@@ -132,4 +194,3 @@ export const buildQueueEmbed = (player: Player, page: number, pageSize: number):
 
   return message;
 };
-