Merge pull request #44 from stefanleminh/Update-to-discordjs-v14

Update to discordjs v14

package.json

@@ -26,9 +26,7 @@
   },
   "homepage": "https://github.com/stefanleminh/ploot#readme",
   "dependencies": {
-    "@discordjs/rest": "^0.4.1",
-    "discord-api-types": "^0.32.1",
-    "discord.js": "^13.7.0",
+    "discord.js": "^14.14.1",
     "keyv": "^4.3.2",
     "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.7.1"
@@ -50,7 +48,7 @@
     "ts-migrate": "^0.1.35",
     "ts-node": "^10.9.1",
     "ts-standard": "^12.0.1",
-    "typescript": "^4.9.4"
+    "typescript": "^5.3.3"
   },
   "standard": {
     "env": [

src/commands/configure.ts

@@ -1,4 +1,4 @@
-import { type CollectorFilter, type CommandInteraction, MessageActionRow, MessageSelectMenu, MessageButton } from 'discord.js'
+import { type CollectorFilter, type CommandInteraction, ComponentType, ChannelType, StringSelectMenuBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
 import { type Properties } from '../types/properties.js'
 import path from 'path'
 import { logging } from '../logging/winston.js'
@@ -21,35 +21,35 @@ export const command: Command = {
     await interaction.deferReply()
 
     const voiceChannels = interaction.guild.channels.cache
-      .filter(channel => channel.type === 'GUILD_VOICE')
+      .filter(channel => channel.type === ChannelType.GuildVoice)
       .map(channel => ({
         label: channel.name,
         value: channel.id
       }))
-    const spectatorVc = new MessageSelectMenu()
+    const spectatorVc = new StringSelectMenuBuilder()
       .setCustomId('spectatorVc')
       .setPlaceholder('Please specify the lobby VC')
       .addOptions(voiceChannels)
 
-    const firstTeamVc = new MessageSelectMenu()
+    const firstTeamVc = new StringSelectMenuBuilder()
       .setCustomId('firstTeamVc')
       .setPlaceholder('Please specify the first team VC')
       .addOptions(voiceChannels)
 
-    const secondTeamVc = new MessageSelectMenu()
+    const secondTeamVc = new StringSelectMenuBuilder()
       .setCustomId('secondTeamVc')
       .setPlaceholder('Please specify the second team VC')
       .addOptions(voiceChannels)
 
-    const button = new MessageButton()
+    const button = new ButtonBuilder()
       .setCustomId('submit')
       .setLabel('Submit')
-      .setStyle('PRIMARY')
+      .setStyle(ButtonStyle.Primary)
 
-    const spectatorSelect = new MessageActionRow().addComponents(spectatorVc)
-    const firstTeamSelect = new MessageActionRow().addComponents(firstTeamVc)
-    const secondTeamSelect = new MessageActionRow().addComponents(secondTeamVc)
-    const submitRow = new MessageActionRow().addComponents(button)
+    const spectatorSelect = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(spectatorVc)
+    const firstTeamSelect = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(firstTeamVc)
+    const secondTeamSelect = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(secondTeamVc)
+    const submitRow = new ActionRowBuilder<ButtonBuilder>().addComponents(button)
 
     const filter: CollectorFilter<any> = i => {
       return i.user.id === interaction.user.id
@@ -58,7 +58,7 @@ export const command: Command = {
     const selectCollector = interaction.channel!.createMessageComponentCollector(
       {
         filter,
-        componentType: 'SELECT_MENU'
+        componentType: ComponentType.StringSelect
       }
     )
 
@@ -90,7 +90,7 @@ export const command: Command = {
     })
 
     const buttonCollector = interaction.channel!.createMessageComponentCollector(
-      { filter, componentType: 'BUTTON' }
+      { filter, componentType: ComponentType.Button }
     )
     buttonCollector.on('collect', async i => {
       await interaction.editReply({

src/commands/help.ts

@@ -14,7 +14,7 @@ export const command: Command = {
     const sortedCommands = properties.commands.sort((a: Command, b: Command) =>
       a.data.name.localeCompare(b.data.name)
     )
-    const helpEmbed = new Discord.MessageEmbed()
+    const helpEmbed = new Discord.EmbedBuilder()
       .setTitle('Help')
       .setColor('#B1F7AA')
       .setAuthor({
@@ -23,10 +23,10 @@ export const command: Command = {
       })
 
     sortedCommands.forEach((command: Command) => {
-      helpEmbed.addField(
-        `/${command.data.name} ${command.args}`,
-        `${command.data.description}`
-      )
+      helpEmbed.addFields({
+        name: `/${command.data.name} ${command.args}`,
+        value: `${command.data.description}`
+      })
     })
 
     await interaction.reply({ embeds: [helpEmbed] })

src/commands/listteams.ts

@@ -1,6 +1,6 @@
 import { type Command } from '../types/command.js'
 import { SlashCommandBuilder } from '@discordjs/builders'
-import { type Guild, type MessageEmbed, type Role, type User, type Collection, type CommandInteraction, type GuildMember } from 'discord.js'
+import { type Guild, type EmbedBuilder, type Role, type User, type Collection, type CommandInteraction, type GuildMember } from 'discord.js'
 import { type Properties } from '../types/properties.js'
 import { createEmbed } from '../modules/functions.js'
 import path from 'path'
@@ -44,7 +44,7 @@ export const command: Command = {
   }
 }
 
-function createTeamEmbeds (lobbyVcMembers: Collection<string, GuildMember>, firstTeamRoleId: any, secondTeamRoleId: any, spectatorRoleId: any, guild: Guild, firstTeamVcId: any, secondTeamVcId: any, lobbyVcId: any): MessageEmbed[] {
+function createTeamEmbeds (lobbyVcMembers: Collection<string, GuildMember>, firstTeamRoleId: any, secondTeamRoleId: any, spectatorRoleId: any, guild: Guild, firstTeamVcId: any, secondTeamVcId: any, lobbyVcId: any): EmbedBuilder[] {
   const firstTeam: User[] = lobbyVcMembers
     .filter((member: GuildMember) => member.roles.cache.some((role: Role) => role.id === firstTeamRoleId))
     .map((guildmember: GuildMember) => guildmember.user)

src/events/ratelimit.ts

@@ -11,7 +11,7 @@ export const event: PlootEvent = {
   name: 'rateLimit',
   async execute (rateLimitData: RateLimitData) {
     logger.info(
-      `Rate limit reached! Timeout: ${rateLimitData.timeout} Limit: ${rateLimitData.limit}`
+      `Rate limit reached! Timeout: ${rateLimitData.timeToReset} Limit: ${rateLimitData.limit}`
     )
   }
 }

src/events/ready.ts

@@ -1,4 +1,4 @@
-import { type Client } from 'discord.js'
+import { ActivityType, type Client } from 'discord.js'
 import { type Properties } from '../types/properties.js'
 import fs from 'fs'
 import path, { dirname } from 'path'
@@ -64,6 +64,6 @@ export const event: PlootEvent = {
     logger.info(
       `${client.user!.tag}, ready to serve ${client.users.cache.size} users in ${client.guilds.cache.size} servers.`
     )
-    client.user!.setActivity(' everyone 👀', { type: 'WATCHING' })
+    client.user!.setActivity(' everyone 👀', { type: ActivityType.Watching })
   }
 }

src/index.ts

@@ -1,4 +1,4 @@
-import { Client, Intents, Collection } from 'discord.js'
+import { Client, GatewayIntentBits, Collection } from 'discord.js'
 import fs from 'fs'
 import path, { dirname } from 'path'
 import { logging } from './logging/winston.js'
@@ -13,9 +13,9 @@ const __dirname = dirname(fileURLToPath(new URL('.', import.meta.url)))
 const logger = logging(path.basename(__filename))
 const client = new Client({
   intents: [
-    Intents.FLAGS.GUILDS,
-    Intents.FLAGS.GUILD_VOICE_STATES,
-    Intents.FLAGS.GUILD_MEMBERS
+    GatewayIntentBits.Guilds,
+    GatewayIntentBits.GuildVoiceStates,
+    GatewayIntentBits.GuildMembers
   ]
 })
 

src/modules/functions.ts

@@ -14,8 +14,8 @@ export function chunk (arr: User[], chunkSize: number): User[][] {
   return R
 }
 
-export function createEmbed (list: User[], title: string, color: HexColorString, guild: Guild): Discord.MessageEmbed {
-  const embed = new Discord.MessageEmbed()
+export function createEmbed (list: User[], title: string, color: HexColorString, guild: Guild): Discord.EmbedBuilder {
+  const embed = new Discord.EmbedBuilder()
     .setTitle(title)
     .setColor(color)
     .setAuthor({