diff --git a/package.json b/package.json index 88c5943..018ffc8 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dependencies": { "@types/node": "^22.5.0", "ansis": "^2.3.0", - "discord.js": "^14.16.1", + "discord.js": "^14.17.2", "formatted-json-stringify": "^1.1.0", "typescript": "^5.5.4" }, @@ -37,7 +37,7 @@ }, "homepage": "https://openticket.dj-dj.be", "imports": { - "#opendiscord":"./dist/src/index.js", - "#opendiscord-types":"./dist/src/core/api/api.js" + "#opendiscord": "./dist/src/index.js", + "#opendiscord-types": "./dist/src/core/api/api.js" } -} \ No newline at end of file +} diff --git a/src/core/api/modules/responder.ts b/src/core/api/modules/responder.ts index bc6b223..0f42eb5 100644 --- a/src/core/api/modules/responder.ts +++ b/src/core/api/modules/responder.ts @@ -315,13 +315,14 @@ export class ODCommandResponderInstance { async reply(msg:ODMessageBuildResult): Promise> { try { + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.type == "interaction" && this.interaction instanceof discord.ChatInputCommandInteraction){ if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:sent} }else{ - const sent = await this.interaction.reply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -337,7 +338,8 @@ export class ODCommandResponderInstance { async defer(ephemeral:boolean){ if (this.type != "interaction" || !(this.interaction instanceof discord.ChatInputCommandInteraction)) return false if (this.interaction.deferred) return false - await this.interaction.deferReply({ephemeral}) + const msgFlags: number[] = ephemeral ? [discord.MessageFlags.Ephemeral] : [] + await this.interaction.deferReply({flags:msgFlags}) this.didReply = true return true } @@ -438,12 +440,13 @@ export class ODButtonResponderInstance { async reply(msg:ODMessageBuildResult): Promise> { try{ + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:sent} }else{ - const sent = await this.interaction.reply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -453,12 +456,13 @@ export class ODButtonResponderInstance { } async update(msg:ODMessageBuildResult): Promise> { try{ + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} }else{ - const sent = await this.interaction.update(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.update(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -469,7 +473,8 @@ export class ODButtonResponderInstance { async defer(type:"reply"|"update", ephemeral:boolean){ if (this.interaction.deferred) return false if (type == "reply"){ - await this.interaction.deferReply({ephemeral}) + const msgFlags: number[] = ephemeral ? [discord.MessageFlags.Ephemeral] : [] + await this.interaction.deferReply({flags:msgFlags}) }else{ await this.interaction.deferUpdate() } @@ -668,12 +673,13 @@ export class ODDropdownResponderInstance { async reply(msg:ODMessageBuildResult): Promise> { try { + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:sent} }else{ - const sent = await this.interaction.reply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -683,12 +689,13 @@ export class ODDropdownResponderInstance { } async update(msg:ODMessageBuildResult): Promise> { try{ + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} }else{ - const sent = await this.interaction.update(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.update(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -699,7 +706,8 @@ export class ODDropdownResponderInstance { async defer(type:"reply"|"update", ephemeral:boolean){ if (this.interaction.deferred) return false if (type == "reply"){ - await this.interaction.deferReply({ephemeral}) + const msgFlags: number[] = ephemeral ? [discord.MessageFlags.Ephemeral] : [] + await this.interaction.deferReply({flags:msgFlags}) }else{ await this.interaction.deferUpdate() } @@ -839,12 +847,13 @@ export class ODModalResponderInstance { async reply(msg:ODMessageBuildResult): Promise> { try{ + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:sent} }else{ - const sent = await this.interaction.reply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.reply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} } @@ -854,8 +863,9 @@ export class ODModalResponderInstance { } async update(msg:ODMessageBuildResult): Promise> { try{ + const msgFlags: number[] = msg.ephemeral ? [discord.MessageFlags.Ephemeral] : [] if (this.interaction.replied || this.interaction.deferred){ - const sent = await this.interaction.editReply(Object.assign(msg.message,{ephemeral:msg.ephemeral})) + const sent = await this.interaction.editReply(Object.assign(msg.message,{flags:msgFlags})) this.didReply = true return {success:true,message:await sent.fetch()} }else throw new ODSystemError() @@ -866,7 +876,8 @@ export class ODModalResponderInstance { async defer(type:"reply"|"update", ephemeral:boolean){ if (this.interaction.deferred) return false if (type == "reply"){ - await this.interaction.deferReply({ephemeral}) + const msgFlags: number[] = ephemeral ? [discord.MessageFlags.Ephemeral] : [] + await this.interaction.deferReply({flags:msgFlags}) }else{ await this.interaction.deferUpdate() }