refactor(#22): update discordx to 11.1.8

package.json

@@ -46,7 +46,7 @@
     "discord-api-types": "^0.36.2",
     "discord-oauth2": "^2.10.0",
     "discord.js": "^14.0.3",
-    "discordx": "^10.0.0",
+    "discordx": "^11.1.8",
     "dotenv": "^16.0.1",
     "fast-folder-size": "^1.7.0",
     "fs": "^0.0.1-security",

src/commands/Admin/prefix.ts

@@ -20,14 +20,15 @@ export default class PrefixCommand {
 		private db: Database,
 	) {}
 
-	@Slash('prefix', { description: 
-		'Here goes the command description!'
+	@Slash({ 
+		name: 'prefix',
+		description: 'Here goes the command description!'
     })
 	@Guard(
 		UserPermissions(['Administrator'])
 	)
 	async prefix(
-		@SlashOption('prefix', { required: false, type: ApplicationCommandOptionType.String }) prefix: string | undefined,
+		@SlashOption({ name: 'prefix', type: ApplicationCommandOptionType.String, required: false }) prefix: string | undefined,
 		interaction: CommandInteraction,
 		{ localize }: InteractionData
 	) {

src/commands/General/help.ts

@@ -16,8 +16,9 @@ export default class HelpCommand {
 		this.loadCategories()
 	}
 
-	@Slash('help', { description: 
-		'Get global help about the bot and its commands'
+	@Slash({ 
+		name: 'help',
+		description: 'Get global help about the bot and its commands'
     })
 	help(interaction: CommandInteraction, client: Client, { sanitizedLocale }: InteractionData): void {
 
@@ -32,7 +33,9 @@ export default class HelpCommand {
 		})
 	}
 
-	@SelectMenuComponent('help-category-selector')
+	@SelectMenuComponent({
+		id: 'help-category-selector'
+	})
 	async selectCategory(interaction: SelectMenuInteraction, client: Client, { sanitizedLocale }: InteractionData) {
 
         const category = interaction.values[0]

src/commands/General/invite.ts

@@ -10,8 +10,9 @@ import { generalConfig } from "@config"
 @Category('General')
 export default class InviteCommand {
 
-	@Slash('invite', { description: 
-		'A simple invite command!'
+	@Slash({ 
+		name: 'invite',
+		description: 'A simple invite command!'
     })
 	@Guard()
 	invite(interaction: CommandInteraction, { localize }: InteractionData): void {

src/commands/General/ping.ts

@@ -9,8 +9,9 @@ import { Slash, Discord } from "@decorators"
 @Category('General')
 export default class PingCommand {
 
-	@Slash('ping', { description: 
-		'Pong!'
+	@Slash({ 
+		name: 'ping',
+		description: 'Pong!'
 	})
 	async ping(
 		interaction: CommandInteraction,

src/commands/General/stats.ts

@@ -50,11 +50,12 @@ export default class StatsCommand {
 		private stats: Stats
 	) {}
 
-	@Slash('stats', { description: 
-		'Here goes the command description!'
+	@Slash({ 
+		name: 'stats',
+		description: 'Here goes the command description!'
     })
 	async statsHandler(
-		@SlashOption('days') days: number,
+		@SlashOption({ name: 'days' }) days: number,
 		interaction: CommandInteraction,
 		{ localize }: InteractionData
 	) {

src/commands/Owner/maintenance.ts

@@ -7,21 +7,21 @@ import { CommandInteraction } from "discord.js"
 @Discord()
 export default class MaintenanceCommand {
 
-	@Slash("maintenance", { description:
-		'Set the bot in maintenance mode.'
+	@Slash({ 
+		name: 'maintenance',
+		description: 'Set the bot in maintenance mode.'
 	})
 	@Guard(
 		Disabled
 	)
 	async maintenance(
-		@SlashOption('state') state: boolean,
+		@SlashOption({ name: 'state' }) state: boolean,
 		interaction: CommandInteraction,
 		{ localize }: InteractionData
 	) {
 
 		await setMaintenance(state)
 
-		const locale = getLocaleFromInteraction(interaction)
 		simpleSuccessEmbed(
 			interaction, 
 			localize['COMMANDS']['MAINTENANCE']['SUCCESS']({

src/commands/Owner/tests.ts

@@ -6,7 +6,9 @@ import { Disabled, Guard } from "@guards"
 @Discord()
 export default class TestsCommand {
 
-	@Slash('test')
+	@Slash({
+		name: 'test'
+	})
 	@Guard(
 		Disabled
 	)
@@ -15,7 +17,7 @@ export default class TestsCommand {
 		console.log('test invoked')
 	}
 
-	@ContextMenu(ApplicationCommandType.User, 'help')
+	@ContextMenu({ type: ApplicationCommandType.User, name: 'help'})
 	async contextMenu(interaction: CommandInteraction) {
 
 		console.log('contextMenu invoked')

src/events/interactionCreate.ts

@@ -7,7 +7,6 @@ import { Maintenance } from '@guards'
 import { Guild, User } from '@entities'
 import { On, Guard, Discord } from '@decorators'
 import { syncUser } from '@utils/functions'
-import { getLocaleFromInteraction, L } from '@i18n'
 
 @Discord()
 @injectable()

src/main.ts

@@ -2,7 +2,7 @@ import 'reflect-metadata'
 import 'dotenv/config'
 
 import { container } from 'tsyringe'
-import { DIService, Client } from 'discordx'
+import { DIService, Client, tsyringeDependencyRegistryEngine } from 'discordx'
 import { importx } from '@discordx/importer'
 
 import { Database, ImagesUpload, ErrorHandler, Logger, WebSocket } from '@services'
@@ -25,7 +25,7 @@ async function run() {
     await db.initialize()
 
     // init the client
-    DIService.container = container
+    DIService.engine = tsyringeDependencyRegistryEngine.setInjector(container)
     const client = new Client(clientConfig)
     container.registerInstance(Client, client)
 

src/utils/decorators/On.ts

@@ -1,4 +1,4 @@
-import { DiscordEvents, EventOptions, MethodDecoratorEx, DOn, MetadataStorage } from 'discordx'
+import { EventOptions, MethodDecoratorEx, DOn, MetadataStorage } from 'discordx'
 
 /**
  * Handle both discord and custom events with a defined handler
@@ -21,8 +21,9 @@ export const On = (event: string, options?: EventOptions): MethodDecoratorEx =>
         const clazz = target as unknown as new () => unknown
         const on = DOn.create({
             botIds: options?.botIds,
-            event: event as DiscordEvents,
+            event: event,
             once: false,
+            rest: false
         }).decorate(clazz.constructor, key, descriptor?.value)
 
         MetadataStorage.instance.addOn(on)

src/utils/decorators/Once.ts

@@ -0,0 +1,31 @@
+import { EventOptions, MethodDecoratorEx, DOn, MetadataStorage } from 'discordx'
+
+/**
+ * Handle both discord and custom events only **once** with a defined handler
+ * @param event - event name
+ * @param options - event parameters
+ * ___
+ *
+ * [View Documentation](https://discord-ts.js.org/docs/decorators/general/on)
+ *
+ * @category Decorator
+ */
+export const Once = (event: string, options?: EventOptions): MethodDecoratorEx => {
+
+    return function <T>(
+        target: Record<string, T>,
+        key: string,
+        descriptor?: PropertyDescriptor
+    ) {
+
+        const clazz = target as unknown as new () => unknown
+        const on = DOn.create({
+            botIds: options?.botIds,
+            event: event,
+            once: true,
+            rest: false
+        }).decorate(clazz.constructor, key, descriptor?.value)
+
+        MetadataStorage.instance.addOn(on)
+    }
+}

src/utils/decorators/Slash.ts

@@ -1,20 +1,16 @@
 import { Locale } from 'discord-api-types/v9'
-import { IGuild, Slash as SlashX, VerifyName } from 'discordx'
+import { ApplicationCommandOptions as DXApplicationCommandOptions, IGuild, Slash as SlashX, VerifyName } from 'discordx'
 
 enum AdditionnalLocaleString {
     English = 'en'
 }
 
 type LocalizationMap = Partial<Record<`${Locale | AdditionnalLocaleString}`, string>>
 
-type ApplicationCommandOptions = {
-    botIds?: string[]
-    defaultPermission?: boolean
-    description?: string
+type ApplicationCommandOptions = Modify<DXApplicationCommandOptions, {
     descriptionLocalizations?: LocalizationMap
-    guilds?: IGuild[]
     nameLocalizations?: LocalizationMap
-}
+}>
 
 /**
  * Handle a slash command with a defined nam
@@ -26,7 +22,7 @@ type ApplicationCommandOptions = {
  *
  * @category Decorator
  */
-export const Slash = <T extends string>(name?: VerifyName<T>, options?: ApplicationCommandOptions) => {
+export const Slash = (options: ApplicationCommandOptions) => {
 
     // convert 'en' localizations to 'en-US' and 'en-GB'
     if (options?.nameLocalizations?.['en']) {
@@ -40,5 +36,5 @@ export const Slash = <T extends string>(name?: VerifyName<T>, options?: Applicat
         delete options.descriptionLocalizations['en']
     }
 
-    return SlashX(name, options)
+    return SlashX(options)
 }

src/utils/decorators/index.ts

@@ -6,7 +6,6 @@ export {
     Guard,
     Guild,
     ModalComponent,
-    Once,
     SelectMenuComponent,
     SimpleCommand,
     SimpleCommandOption,
@@ -16,6 +15,7 @@ export {
 } from 'discordx'
 
 export * from './On'
+export * from './Once'
 export * from './Slash'
 export * from './Schedule'
 export * from './WSOn'

src/utils/types/utils.d.ts

@@ -0,0 +1 @@
+type Modify<T, R> = Omit<T, keyof R> & R