Merge pull request #111 from InsertSoda/main

Slash commands

Author: StarManTheGamer

.env.example

@@ -1 +1,2 @@
 TOKEN=
+CLIENTID=

package.json

@@ -1,13 +1,15 @@
 {
 	"name": "polytoria-community-bot",
-	"version": "2.7.1",
+	"version": "3.0.0",
 	"type": "module",
 	"typings": "./types",
 	"scripts": {
 		"start": "node dist/index.js",
 		"build": "tsc",
 		"format": "prettier --write .",
-		"lint": "npx eslint \"src/**\" --fix"
+		"lint": "npx eslint \"src/**\" --fix",
+		"deploy": "node dist/deploy-commands.js",
+		"dev": "npm run build && npm run start"
 	},
 	"license": "MIT",
 	"dependencies": {

src/commands/commands.ts

@@ -1,6 +1,6 @@
-import { EmbedBuilder, Message } from 'discord.js'
+import { CommandInteraction, EmbedBuilder } from 'discord.js'
 
-export async function commands (message: Message) {
+export async function commands (interaction:CommandInteraction) {
   const embed: EmbedBuilder = new EmbedBuilder()
     .setColor(0xFF5454)
     .setTitle('This command is currently unavailable.')
@@ -11,5 +11,5 @@ export async function commands (message: Message) {
     )
     .setFooter({ text: 'Thank you for your patience.', iconURL: 'https://starmanthegamer.com/icon.png' })
 
-  await message.channel.send({ embeds: [embed] })
+  await interaction.reply({ embeds: [embed] })
 }

src/commands/cookie.ts

@@ -1,5 +1,5 @@
-import { Message } from 'discord.js'
+import { CommandInteraction } from 'discord.js'
 
-export async function cookie (message: Message, args: any[]): Promise<Message<boolean>> {
-  return await message.reply('🍪')
+export async function cookie (interaction:CommandInteraction) {
+  await interaction.reply('🍪')
 }

src/commands/guild/guilds.ts

@@ -1,4 +1,4 @@
-import { Message, EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder, ButtonBuilder, ButtonStyle, ComponentType, BaseInteraction } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder, ButtonBuilder, ButtonStyle, ComponentType, BaseInteraction, CommandInteraction } from 'discord.js'
 import axios from 'axios'
 import { responseHandler } from '../../utils/responseHandler.js'
 import { dateUtils } from '../../utils/dateUtils.js'
@@ -7,21 +7,28 @@ import { fetchMembers } from './GuildMembers.js'
 import { fetchStore } from './GuildStore.js'
 import { fetchShouts } from './GuildShouts.js'
 
-export async function guild (message: Message, args: string[]): Promise<Message | null> {
-  const guildID: number = parseInt(args[0])
+export async function guild (interaction:CommandInteraction) {
+  // @ts-expect-error
+  const guildID = interaction.options.getInteger('id')
 
-  if (args.length === 0) {
-    return message.reply('Please provide me with a guild ID before I can continue!')
+  if (guildID.length === 0) {
+    return await interaction.reply('Please provide me with a guild ID before I can continue!')
   }
 
+  await interaction.deferReply()
+
   const response = await axios.get(`https://api.polytoria.com/v1/guilds/${guildID}`, { validateStatus: () => true })
   const data = response.data
   const creator = data.creator
 
   const errResult = responseHandler.checkError(response)
 
   if (errResult.hasError === true) {
-    return message.channel.send(errResult.displayText)
+    if (errResult.statusCode === 404) {
+      return await interaction.editReply("Couldn't find the requested guild. Did you type in the correct guild ID?")
+    } else {
+      return await interaction.editReply(errResult.displayText)
+    }
   }
 
   let joinType!: string
@@ -129,7 +136,7 @@ export async function guild (message: Message, args: string[]): Promise<Message
   const actionRow = new ActionRowBuilder<StringSelectMenuBuilder>()
     .addComponents(dropdown)
 
-  const reply = await message.reply({
+  const reply = await interaction.editReply({
     embeds: [embed],
     components: [actionRow]
   })
@@ -142,17 +149,17 @@ export async function guild (message: Message, args: string[]): Promise<Message
 
   const collector = reply.createMessageComponentCollector({
     componentType: ComponentType.SelectMenu,
-    filter: (interaction: BaseInteraction) => (
-      interaction.isStringSelectMenu() && interaction.customId === 'dropdown_menu' &&
-      interaction.user.id === message.author.id
+    filter: (messageInteraction: BaseInteraction) => (
+      messageInteraction.isStringSelectMenu() && messageInteraction.customId === 'dropdown_menu' &&
+      messageInteraction.user.id === interaction.user.id
     ),
     time: 60000
   })
 
-  collector.on('collect', async (interaction) => {
-    await interaction.deferUpdate()
+  collector.on('collect', async (messageInteraction) => {
+    await messageInteraction.deferUpdate()
 
-    selectedOption = interaction.values[0]
+    selectedOption = messageInteraction.values[0]
 
     if (selectedOption === 'guild_option') {
       await interaction.editReply({
@@ -200,14 +207,14 @@ export async function guild (message: Message, args: string[]): Promise<Message
     filter: (btnInteraction: BaseInteraction) => (
       btnInteraction.isButton() &&
       btnInteraction.customId === 'prev_button' &&
-      btnInteraction.user.id === message.author.id
+      btnInteraction.user.id === interaction.user.id
     ),
     time: 60000
   })
 
-  prevButtonCollector.on('collect', async (interaction) => {
+  prevButtonCollector.on('collect', async (buttonInteraction) => {
     try {
-      await interaction.deferUpdate()
+      await buttonInteraction.deferUpdate()
 
       if (selectedOption === 'members_option' && memberPage > 1) {
         memberPage--
@@ -258,14 +265,14 @@ export async function guild (message: Message, args: string[]): Promise<Message
     filter: (btnInteraction: BaseInteraction) => (
       btnInteraction.isButton() &&
       btnInteraction.customId === 'next_button' &&
-      btnInteraction.user.id === message.author.id
+      btnInteraction.user.id === interaction.user.id
     ),
     time: 60000
   })
 
-  nextButtonCollector.on('collect', async (interaction) => {
+  nextButtonCollector.on('collect', async (buttonInteraction) => {
     try {
-      await interaction.deferUpdate()
+      await buttonInteraction.deferUpdate()
 
       if (selectedOption === 'members_option') {
         memberPage++
@@ -310,6 +317,4 @@ export async function guild (message: Message, args: string[]): Promise<Message
       console.error('Error handling interaction:', error)
     }
   })
-
-  return reply
 }

src/commands/info.ts

@@ -1,13 +1,13 @@
-import { EmbedBuilder, Message, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction } from 'discord.js'
 
-export async function info (message: Message) {
+export async function info (interaction:CommandInteraction) {
   const invite = new ButtonBuilder()
-    .setLabel('Invite us!')
+    .setLabel('Invite the bot to your server!')
     .setURL('https://discord.com/api/oauth2/authorize?client_id=905979909049028649&permissions=414464724032&scope=bot')
     .setStyle(ButtonStyle.Link)
 
   const github = new ButtonBuilder()
-    .setLabel('GitHub')
+    .setLabel('GitHub Repository')
     .setURL('https://github.com/Polytoria/CommunityBot')
     .setStyle(ButtonStyle.Link)
 
@@ -21,9 +21,9 @@ export async function info (message: Message) {
     .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 }
+      { name: 'Contributed by:', value: 'baggy, DevPixels, Index, InsertSoda, 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] })
+  await interaction.reply({ embeds: [embed], components: [row] })
 }

src/commands/place.ts

@@ -1,16 +1,19 @@
-import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction } from 'discord.js'
 import axios from 'axios'
 import { responseHandler } from '../utils/responseHandler.js'
 import { dateUtils } from '../utils/dateUtils.js'
 import emojiUtils from '../utils/emojiUtils.js'
 
-export async function place (message: Message, args: string[]) {
-  const placeID = parseInt(args[0])
+export async function place (interaction:CommandInteraction) {
+  // @ts-expect-error
+  const placeID = interaction.options.getInteger('id')
 
-  if (args.length === 0) {
-    return message.reply('Please provide me with a place ID before I can continue!')
+  if (placeID.length === 0) {
+    return await interaction.reply('Please provide me with a place ID before I can continue!')
   }
 
+  await interaction.deferReply()
+
   const response = await axios.get(`https://api.polytoria.com/v1/places/${placeID}`, { validateStatus: () => true })
   const data = response.data
   const rating = data.rating
@@ -19,7 +22,11 @@ export async function place (message: Message, args: string[]) {
   const errResult = responseHandler.checkError(response)
 
   if (errResult.hasError === true) {
-    return message.channel.send(errResult.displayText)
+    if (errResult.statusCode === 404) {
+      return await interaction.editReply("Couldn't find the requested place. Did you type in the correct place ID?")
+    } else {
+      return await interaction.editReply(errResult.displayText)
+    }
   }
 
   let externalDesc = ''
@@ -119,7 +126,7 @@ export async function place (message: Message, args: string[]) {
         .setStyle(ButtonStyle.Link)
     )
 
-  return message.reply({
+  return await interaction.editReply({
     embeds: [embed],
     components: [actionRow]
   })

src/commands/random.ts

@@ -1,12 +1,12 @@
-import { Message, EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder, ComponentType, BaseInteraction, StringSelectMenuOptionBuilder } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, StringSelectMenuBuilder, ComponentType, BaseInteraction, StringSelectMenuOptionBuilder, CommandInteraction } from 'discord.js'
 
 // Import Random Files
 import { randomPlace } from './random/randomPlace.js'
 import { randomUser } from './random/randomUser.js'
 import { randomGuild } from './random/randomGuild.js'
 import { randomStore } from './random/randomStore.js'
 
-export async function random (message: Message, args: any[]) {
+export async function random (interaction:CommandInteraction) {
   let InitialType: any = null
 
   const embed = new EmbedBuilder()
@@ -49,56 +49,56 @@ export async function random (message: Message, args: any[]) {
       selectMenu
     )
 
-  const reply = await message.reply({
+  const reply = await interaction.reply({
     embeds: [embed],
     components: [actionRow]
   })
 
   const selectCollector = reply.createMessageComponentCollector({
     componentType: ComponentType.StringSelect,
-    filter: (interaction: BaseInteraction) => (
-      interaction.isStringSelectMenu() && interaction.user.id === message.author.id
+    filter: (selectInteraction: BaseInteraction) => (
+      selectInteraction.isStringSelectMenu() && selectInteraction.user.id === interaction.user.id
     ),
     time: 60000
   })
 
-  selectCollector.on('collect', async (interaction) => {
-    if (interaction.customId === 'select') {
-      InitialType = interaction.values[0] // Update InitialType here
-      await interaction.deferUpdate()
+  selectCollector.on('collect', async (selectInteraction) => {
+    if (selectInteraction.customId === 'select') {
+      InitialType = selectInteraction.values[0] // Update InitialType here
+      await selectInteraction.deferUpdate()
       update(InitialType, reply)
     }
   })
 
   const buttonCollector = reply.createMessageComponentCollector({
     componentType: ComponentType.Button,
-    filter: (interaction: BaseInteraction) => (
-      interaction.isButton() && interaction.user.id === message.author.id && interaction.customId === 'redo_button'
+    filter: (buttonInteraction: BaseInteraction) => (
+      buttonInteraction.isButton() && buttonInteraction.user.id === interaction.user.id && buttonInteraction.customId === 'redo_button'
     ),
     time: 60000
   })
 
-  buttonCollector.on('collect', async (interaction) => {
+  buttonCollector.on('collect', async (buttonInteraction) => {
     if (InitialType !== null) {
       update(InitialType, reply)
-      await interaction.deferUpdate()
+      await buttonInteraction.deferUpdate()
     }
   })
 
   async function update (id: string, reply: any) {
     let Response: any = null
     switch (id) {
       case 'place':
-        Response = await randomPlace(message, args)
+        Response = await randomPlace(interaction)
         break
       case 'user':
-        Response = await randomUser(message, args)
+        Response = await randomUser(interaction)
         break
       case 'guild':
-        Response = await randomGuild(message, args)
+        Response = await randomGuild(interaction)
         break
       case 'store':
-        Response = await randomStore(message, args)
+        Response = await randomStore(interaction)
         break
     }
 

src/commands/random/randomGuild.ts

@@ -1,9 +1,9 @@
-import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction } from 'discord.js'
 import emojiUtils from '../../utils/emojiUtils.js'
 import { dateUtils } from '../../utils/dateUtils.js'
 import { randomUtils } from '../../utils/randomUtils.js'
 
-export async function randomGuild (message: Message, args: string[]) {
+export async function randomGuild (interaction: CommandInteraction): Promise<any> {
   const randomId = randomUtils.randomInt(1, 545)
   const apiUrl = `https://api.polytoria.com/v1/guilds/${randomId}`
 
@@ -19,7 +19,7 @@ export async function randomGuild (message: Message, args: string[]) {
   )
 
   if (randomData == null) {
-    return message.channel.send('Guild not found, Please try again..')
+    return await randomGuild(interaction)
   }
 
   const data = randomData.data

src/commands/random/randomPlace.ts

@@ -1,10 +1,10 @@
-import { Message, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
+import { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction } from 'discord.js'
 import { dateUtils } from '../../utils/dateUtils.js'
 import { randomUtils } from '../../utils/randomUtils.js'
 import emojiUtils from '../../utils/emojiUtils.js'
 
-export async function randomPlace (message: Message, args: string[]) {
-  const randomId = randomUtils.randomInt(1, 7667)
+export async function randomPlace (interaction: CommandInteraction): Promise<any> {
+  const randomId = randomUtils.randomInt(1, 7940)
   const apiUrl = `https://api.polytoria.com/v1/places/${randomId}`
 
   const randomData = await randomUtils.randomize(
@@ -19,7 +19,7 @@ export async function randomPlace (message: Message, args: string[]) {
   )
 
   if (!randomData || !randomData.data) {
-    return message.channel.send('Place not found, please try again.')
+    return await randomPlace(interaction)
   }
 
   const data = randomData.data