Merge pull request #107 from Polytoria/v14-upgrade

V14 upgrade has been completed

Author: StarManTheGamer

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "polytoria-community-bot",
-	"version": "2.5.0.2",
+	"version": "2.6.0",
 	"type": "module",
 	"typings": "./types",
 	"scripts": {
@@ -14,14 +14,15 @@
 		"axios": "^1.4.0",
 		"canvas": "^2.11.2",
 		"chalk": "^5.0.0",
-		"discord.js": "^13.3.1",
+		"discord.js": "^14.13.0",
 		"dom-parser": "^0.1.6",
 		"dotenv": "^16.3.1",
 		"esm": "^3.2.25",
 		"module-alias": "^2.2.2",
 		"string-progressbar": "^1.0.4",
 		"text-table": "^0.2.0",
 		"timestamp-conv": "^3.0.0",
+		"typescript": "^5.1.6",
 		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
@@ -36,7 +37,6 @@
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-promise": "^5.2.0",
 		"prettier": "^3.0.0",
-		"prettier-eslint": "^13.0.0",
-		"typescript": "^4.5.4"
+		"prettier-eslint": "^13.0.0"
 	}
 }

src/commands/commands.ts

@@ -1,12 +1,15 @@
-import { MessageEmbed, Message } from 'discord.js'
+import { EmbedBuilder, Message } from 'discord.js'
 
 export async function commands (message: Message) {
-  const embed: MessageEmbed = new MessageEmbed()
+  const embed: EmbedBuilder = new EmbedBuilder()
+    .setColor(0xFF5454)
+    .setTitle('This command is currently unavailable.')
+    .setThumbnail('https://starmanthegamer.com/icon.png')
+    .addFields(
+      { name: 'What happened?', value: 'Polytoria has revamped their entire website, and we rely on APIs to access the information we serve to you. With those APIs currently being unavailable, we cannot serve you the requested command.' },
+      { name: 'When will this command return?', value: 'In the future when the API for this command returns.', inline: true }
+    )
+    .setFooter({ text: 'Thank you for your patience.', iconURL: 'https://starmanthegamer.com/icon.png' })
 
-  embed.setThumbnail('https://starmanthegamer.com/icon.png')
-  embed.setColor('#fe5953')
-  embed.setTitle('This command is currently unavailable.')
-  embed.addField('What happened?', 'Polytoria has revamped their entire website, and we rely on APIs to access the information we serve to you. With those APIs currently being unavailable, we cannot serve you the requested command.')
-  embed.addField('When will this command return?', 'In the future when the API for this command returns.')
   await message.channel.send({ embeds: [embed] })
 }

src/commands/guild.ts

@@ -1,4 +1,4 @@
-import { Message, MessageEmbed, MessageActionRow, MessageButton, Interaction } from 'discord.js'
+import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, BaseInteraction } from 'discord.js'
 import axios from 'axios'
 import { responseHandler } from '../utils/responseHandler.js'
 import { dateUtils } from '../utils/dateUtils.js'
@@ -21,9 +21,9 @@ export async function guild (message: Message, args: string[]): Promise<Message
     return message.channel.send(errResult.displayText)
   }
 
-  const embed = new MessageEmbed()
+  const embed = new EmbedBuilder()
     .setTitle(data.name + ' ' + (data.isVerified === true ? emojiUtils.checkmark : ''))
-    .setDescription(data.description)
+    .setDescription(data.description === '' ? 'No description set.' : data.description)
     .setURL('https://polytoria.com/guilds/' + data.id.toString())
     .setThumbnail(data.thumbnail)
     .setColor(data.color)
@@ -65,39 +65,39 @@ export async function guild (message: Message, args: string[]): Promise<Message
     .map((member: any) => `[${member.user.username}](https://polytoria.com/users/${member.user.id})`)
     .join('\n')
 
-  const memberEmbed = new MessageEmbed()
+  const memberEmbed = new EmbedBuilder()
     .setTitle(data.name + ' - Members ' + (data.isVerified === true ? emojiUtils.checkmark : ''))
     .setDescription(memberUsernames)
     .setThumbnail(data.thumbnail)
     .setColor(data.color)
     .setURL('https://polytoria.com/guilds/' + data.id.toString())
 
-  const guildButton = new MessageButton()
+  const guildButton = new ButtonBuilder()
     .setLabel('Guild')
-    .setStyle('PRIMARY')
+    .setStyle(ButtonStyle.Primary)
     .setCustomId('guild_button')
 
-  const membersButton = new MessageButton()
+  const membersButton = new ButtonBuilder()
     .setLabel('Members')
-    .setStyle('PRIMARY')
+    .setStyle(ButtonStyle.Primary)
     .setCustomId('members_button')
 
-  const nextButton = new MessageButton()
+  const nextButton = new ButtonBuilder()
     .setLabel('Next')
-    .setStyle('SUCCESS')
+    .setStyle(ButtonStyle.Success)
     .setCustomId('next_button')
 
-  const prevButton = new MessageButton()
+  const prevButton = new ButtonBuilder()
     .setLabel('Previous')
-    .setStyle('DANGER')
+    .setStyle(ButtonStyle.Danger)
     .setCustomId('prev_button')
 
-  const actionRow: MessageActionRow = new MessageActionRow()
+  const actionRow = new ActionRowBuilder<ButtonBuilder>()
     .addComponents(
-      new MessageButton()
+      new ButtonBuilder()
         .setURL(`https://polytoria.com/guilds/${data.id}`)
         .setLabel('View on Polytoria')
-        .setStyle('LINK')
+        .setStyle(ButtonStyle.Link)
     )
     .addComponents(
       membersButton
@@ -111,8 +111,8 @@ export async function guild (message: Message, args: string[]): Promise<Message
   let memberPage = 1
 
   const collector = reply.createMessageComponentCollector({
-    componentType: 'BUTTON',
-    filter: (interaction: Interaction) => (
+    componentType: ComponentType.Button,
+    filter: (interaction: BaseInteraction) => (
       interaction.isButton() && interaction.user.id === message.author.id
     ),
     time: 60000
@@ -129,13 +129,13 @@ export async function guild (message: Message, args: string[]): Promise<Message
       await reply.edit({
         embeds: [memberEmbed],
         components: [
-          new MessageActionRow().addComponents(guildButton, prevButton, nextButton)
+          new ActionRowBuilder<ButtonBuilder>().addComponents(guildButton, prevButton, nextButton)
         ]
       })
 
       const guildButtonCollector = reply.createMessageComponentCollector({
-        componentType: 'BUTTON',
-        filter: (btnInteraction: Interaction) => (
+        componentType: ComponentType.Button,
+        filter: (btnInteraction: BaseInteraction) => (
           btnInteraction.isButton() &&
           btnInteraction.customId === 'guild_button' &&
           btnInteraction.user.id === message.author.id
@@ -154,8 +154,8 @@ export async function guild (message: Message, args: string[]): Promise<Message
       })
 
       const nextButtonCollector = reply.createMessageComponentCollector({
-        componentType: 'BUTTON',
-        filter: (btnInteraction: Interaction) => (
+        componentType: ComponentType.Button,
+        filter: (btnInteraction: BaseInteraction) => (
           btnInteraction.isButton() &&
           btnInteraction.customId === 'next_button' &&
           btnInteraction.user.id === message.author.id
@@ -178,14 +178,14 @@ export async function guild (message: Message, args: string[]): Promise<Message
         await reply.edit({
           embeds: [memberEmbed],
           components: [
-            new MessageActionRow().addComponents(guildButton, prevButton, nextButton)
+            new ActionRowBuilder<ButtonBuilder>().addComponents(guildButton, prevButton, nextButton)
           ]
         })
       })
 
       const prevButtonCollector = reply.createMessageComponentCollector({
-        componentType: 'BUTTON',
-        filter: (btnInteraction: Interaction) => (
+        componentType: ComponentType.Button,
+        filter: (btnInteraction: BaseInteraction) => (
           btnInteraction.isButton() &&
           btnInteraction.customId === 'prev_button' &&
           btnInteraction.user.id === message.author.id
@@ -209,7 +209,7 @@ export async function guild (message: Message, args: string[]): Promise<Message
           await reply.edit({
             embeds: [memberEmbed],
             components: [
-              new MessageActionRow().addComponents(guildButton, prevButton, nextButton)
+              new ActionRowBuilder<ButtonBuilder>().addComponents(guildButton, prevButton, nextButton)
             ]
           })
         }

src/commands/help.ts

@@ -1,4 +1,4 @@
-import { Message, MessageEmbed, MessageActionRow, MessageButton } from 'discord.js'
+import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
 import pages from './helpPages.js'
 import { v4 } from 'uuid'
 
@@ -11,18 +11,17 @@ export async function help (message: Message, args: string[]) {
     return pages[currentPage]
   }
 
-  const embed = new MessageEmbed({
+  const originalHelpData: any = await changePage()
+  const embed = new EmbedBuilder({
     title: 'List of available commands',
-    color: '#ff5454',
+    color: 0xFF5454,
     description: 'Prefix: `p!`',
     thumbnail: {
       url: 'https://cdn.discordapp.com/icons/587167555068624915/4149b9aea50a0fd41260d71ac743407d.webp?size=128'
     }
   })
 
-  // Fetch Friends
-  const helpData: any = await changePage()
-  embed.fields = helpData
+  embed.addFields(originalHelpData)
 
   // Generate Button ID base on current time
   const buttonID: string = v4()
@@ -31,13 +30,13 @@ export async function help (message: Message, args: string[]) {
   const rightBtnID: string = 'right' + buttonID
 
   // Create Buttons
-  const leftBtn: MessageButton = new MessageButton().setCustomId(leftBtnID).setLabel('◀').setStyle('PRIMARY').setDisabled(true)
+  const leftBtn: ButtonBuilder = new ButtonBuilder().setCustomId(leftBtnID).setLabel('◀').setStyle(ButtonStyle.Primary).setDisabled(true)
 
-  const pageNumBtn: MessageButton = new MessageButton().setCustomId(pageNum).setLabel(`Page ${currentPage + 1} of ${pagesCount}`).setStyle('SECONDARY')
+  const pageNumBtn: ButtonBuilder = new ButtonBuilder().setCustomId(pageNum).setLabel(`Page ${currentPage + 1} of ${pagesCount}`).setStyle(ButtonStyle.Secondary)
 
-  const rightBtn: MessageButton = new MessageButton().setCustomId(rightBtnID).setLabel('▶').setStyle('PRIMARY')
+  const rightBtn: ButtonBuilder = new ButtonBuilder().setCustomId(rightBtnID).setLabel('▶').setStyle(ButtonStyle.Primary)
 
-  const row = new MessageActionRow().addComponents(leftBtn).addComponents(pageNumBtn).addComponents(rightBtn)
+  const row = new ActionRowBuilder<ButtonBuilder>().addComponents(leftBtn, pageNumBtn, rightBtn)
 
   const filter = () => true
 
@@ -74,15 +73,20 @@ export async function help (message: Message, args: string[]) {
       leftBtn.setDisabled(false)
     }
 
+    if (currentPage === 0) {
+      embed.data.fields = []
+      embed.addFields(originalHelpData)
+    } else {
+      const helpData: any = changePage()
+      embed.data.fields = []
+      embed.addFields(helpData)
+    }
+
     // Set Page
     pageNumBtn.setLabel(`Page ${currentPage + 1} of ${pagesCount.toString()}`)
 
-    // Fetch Help page
-    const helpData: any = changePage()
-    embed.fields = helpData
-
     // Update Embed and Button
-    const updatedRow = new MessageActionRow().addComponents(leftBtn).addComponents(pageNumBtn).addComponents(rightBtn)
+    const updatedRow = new ActionRowBuilder<ButtonBuilder>().addComponents(leftBtn, pageNumBtn, rightBtn)
     await msg.edit({ embeds: [embed], components: [updatedRow] })
     await i.reply({ content: ' ', ephemeral: true })
   })

src/commands/info.ts

@@ -1,16 +1,29 @@
-import { MessageEmbed, Message } from 'discord.js'
+import { EmbedBuilder, Message, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
 
 export async function info (message: Message) {
-  const embed: MessageEmbed = new MessageEmbed()
+  const invite = new ButtonBuilder()
+    .setLabel('Invite us!')
+    .setURL('https://discord.com/api/oauth2/authorize?client_id=905979909049028649&permissions=414464724032&scope=bot')
+    .setStyle(ButtonStyle.Link)
 
-  embed.setThumbnail('https://starmanthegamer.com/icon.png')
-  embed.setColor('#fe5953')
-  embed.setTitle('Polytoria Community Bot')
-  embed.setURL('https://discord.com/api/oauth2/authorize?client_id=905979909049028649&permissions=414464724032&scope=bot')
-  embed.addField('Version', `Running version ${process.env.npm_package_version}`)
-  embed.addField('Invite our Bot', 'Tap the title to invite our bot directly to your server!')
-  embed.addField('We are open-sourced!', 'https://github.com/Polytoria/Polytoria-Community-Bot')
-  embed.addField('Rewritten by', 'Shiggy, DevPixels, baggy, and more!')
-  embed.setFooter('Thanks to all collaborators of the project!')
-  await message.channel.send({ embeds: [embed] })
+  const github = new ButtonBuilder()
+    .setLabel('GitHub')
+    .setURL('https://github.com/Polytoria/CommunityBot')
+    .setStyle(ButtonStyle.Link)
+
+  const row = new ActionRowBuilder<ButtonBuilder>()
+    .addComponents(github, invite)
+
+  const embed: EmbedBuilder = new EmbedBuilder()
+    .setColor(0xFF5454)
+    .setTitle('Polytoria Community Bot')
+    .setURL('https://discord.com/api/oauth2/authorize?client_id=905979909049028649&permissions=414464724032&scope=bot')
+    .setThumbnail('https://starmanthegamer.com/icon.png')
+    .addFields(
+      { name: 'Version', value: `Currently running version: ${process.env.npm_package_version}` },
+      { name: 'Contributed by:', value: 'baggy, Hu Tao, Shiggy, and many more!', inline: true }
+    )
+    .setFooter({ text: 'Thank you for using Polytoria Community Bot!', iconURL: 'https://starmanthegamer.com/icon.png' })
+
+  await message.channel.send({ embeds: [embed], components: [row] })
 }

src/commands/ping.ts

@@ -1,4 +1,4 @@
-import { Message, MessageEmbed, MessageActionRow, MessageButton } from 'discord.js'
+import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
 import axios from 'axios'
 import { responseHandler } from '../utils/responseHandler.js'
 import { dateUtils } from '../utils/dateUtils.js'
@@ -36,16 +36,14 @@ export async function place (message: Message, args: string[]) {
     externalDesc += data.description
   }
 
-  const embed = new MessageEmbed({
+  const embed = new EmbedBuilder({
     title: (data.name + ' ' + (data.isFeatured === true ? emojiUtils.star : '')),
     description: externalDesc,
     thumbnail: {
       url: `${data.thumbnail}`
     },
     url: `https://polytoria.com/places/${data.id}`,
-    color: '#ff5454',
-    image: {
-    },
+    color: 0xFF5454,
     fields: [
       {
         name: 'Creator',
@@ -95,13 +93,12 @@ export async function place (message: Message, args: string[]) {
     ]
   })
 
-  // Create the action row and button
-  const actionRow = new MessageActionRow()
+  const actionRow = new ActionRowBuilder<ButtonBuilder>()
     .addComponents(
-      new MessageButton()
+      new ButtonBuilder()
         .setURL(`https://polytoria.com/places/${data.id}`)
         .setLabel('View on Polytoria')
-        .setStyle('LINK')
+        .setStyle(ButtonStyle.Link)
     )
 
   return message.reply({

src/commands/place.ts

@@ -1,4 +1,4 @@
-import { Message, MessageEmbed, MessageActionRow, MessageButton } from 'discord.js'
+import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
 import emojiUtils from '../../utils/emojiUtils.js'
 import { dateUtils } from '../../utils/dateUtils.js'
 import { randomUtils } from '../../utils/randomUtils.js'
@@ -27,9 +27,9 @@ export async function randomGuild (message: Message, args: string[]) {
   const data = randomData.data
   const creator = data.creator
 
-  const embed = new MessageEmbed()
+  const embed = new EmbedBuilder()
     .setTitle(data.name + ' ' + (data.isVerified === true ? emojiUtils.checkmark : ''))
-    .setDescription(data.description)
+    .setDescription(data.description === '' ? 'No description set.' : data.description)
     .setURL('https://polytoria.com/guilds/' + data.id.toString())
     .setThumbnail(data.thumbnail)
     .setColor(data.color)
@@ -65,13 +65,12 @@ export async function randomGuild (message: Message, args: string[]) {
     embed.setImage(data.banner)
   }
 
-  // Create the action row and button
-  const actionRow = new MessageActionRow()
+  const actionRow = new ActionRowBuilder<ButtonBuilder>()
     .addComponents(
-      new MessageButton()
+      new ButtonBuilder()
         .setURL(`https://polytoria.com/guilds/${data.id}`)
         .setLabel('View on Polytoria')
-        .setStyle('LINK')
+        .setStyle(ButtonStyle.Link)
     )
 
   return message.reply({