From e4b4acfd9f56d1114b919e2db7a297caacf071d4 Mon Sep 17 00:00:00 2001 From: DJj123dj <80536295+DJj123dj@users.noreply.github.com> Date: Mon, 4 May 2026 19:05:58 +0200 Subject: [PATCH] Rename: "source" to "origin" for improved readability --- src/actions/addTicketUser.ts | 14 +- src/actions/claimTicket.ts | 26 +- src/actions/clearTickets.ts | 10 +- src/actions/closeTicket.ts | 24 +- src/actions/createTicket.ts | 16 +- src/actions/createTicketPermissions.ts | 10 +- src/actions/createTranscript.ts | 12 +- src/actions/deleteTicket.ts | 36 +-- src/actions/handleTranscriptErrors.ts | 24 +- src/actions/handleVerifyBar.ts | 4 +- src/actions/moveTicket.ts | 14 +- src/actions/pinTicket.ts | 26 +- src/actions/reactionRole.ts | 12 +- src/actions/removeTicketUser.ts | 14 +- src/actions/renameTicket.ts | 14 +- src/actions/reopenTicket.ts | 32 +-- src/actions/transferTicket.ts | 10 +- src/actions/unclaimTicket.ts | 26 +- src/actions/unpinTicket.ts | 26 +- src/actions/updateTicketPriority.ts | 10 +- src/actions/updateTicketTopic.ts | 10 +- src/builders/buttons.ts | 42 ++-- src/builders/embeds.ts | 168 ++++++------- src/builders/files.ts | 2 +- src/builders/messages.ts | 316 ++++++++++++------------- src/builders/modals.ts | 32 +-- src/commands/add.ts | 12 +- src/commands/autoclose.ts | 14 +- src/commands/autocomplete.ts | 4 +- src/commands/autodelete.ts | 14 +- src/commands/blacklist.ts | 28 +-- src/commands/claim.ts | 36 +-- src/commands/clear.ts | 18 +- src/commands/close.ts | 36 +-- src/commands/delete.ts | 48 ++-- src/commands/help.ts | 16 +- src/commands/move.ts | 12 +- src/commands/panel.ts | 16 +- src/commands/pin.ts | 46 ++-- src/commands/priority.ts | 14 +- src/commands/remove.ts | 12 +- src/commands/rename.ts | 12 +- src/commands/reopen.ts | 42 ++-- src/commands/role.ts | 8 +- src/commands/stats.ts | 34 +-- src/commands/ticket.ts | 76 +++--- src/commands/topic.ts | 12 +- src/commands/transfer.ts | 12 +- src/commands/unclaim.ts | 36 +-- src/commands/unpin.ts | 36 +-- src/data/framework/codeLoader.ts | 16 +- 51 files changed, 770 insertions(+), 770 deletions(-) diff --git a/src/actions/addTicketUser.ts b/src/actions/addTicketUser.ts index 0b8dd92..660f9af 100644 --- a/src/actions/addTicketUser.ts +++ b/src/actions/addTicketUser.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:add-ticket-user")) opendiscord.actions.get("opendiscord:add-ticket-user").workers.add([ - new api.ODWorker("opendiscord:add-ticket-user",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:add-ticket-user",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params if (channel.isThread()) throw new api.ODSystemError("Unable to add user to ticket! Open Ticket doesn't support threads!") @@ -51,27 +51,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:add-message").build(source,{guild,channel,user,ticket,reason,data})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:add-message").build(origin,{guild,channel,user,ticket,reason,data})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketUserAdded").emit([ticket,user,data,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.adding.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"add",reason,additionalData:data})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"add",reason,additionalData:data})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.adding.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"add",reason,additionalData:data})) + if (creator && generalConfig.data.system.messages.adding.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"add",reason,additionalData:data})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket,data} = params opendiscord.log(user.displayName+" added "+data.displayName+" to a ticket!","info",[ @@ -80,7 +80,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/claimTicket.ts b/src/actions/claimTicket.ts index 452f5c4..e0a8dae 100644 --- a/src/actions/claimTicket.ts +++ b/src/actions/claimTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:claim-ticket")) opendiscord.actions.get("opendiscord:claim-ticket").workers.add([ - new api.ODWorker("opendiscord:claim-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:claim-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to claim ticket! Open Ticket doesn't support threads!") @@ -62,27 +62,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:claim-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:claim-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketClaimed").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.claiming.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"claim",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"claim",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.claiming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"claim",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.claiming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"claim",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" claimed a ticket!","info",[ @@ -91,7 +91,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -105,7 +105,7 @@ export const registerVerifyBars = async () => { //CLAIM TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:claim-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:claim-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.claim if (permissionMode == "none"){ @@ -138,7 +138,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -173,7 +173,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:claim-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -192,7 +192,7 @@ export const registerVerifyBars = async () => { //CLAIM TICKET UNCLAIM MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:claim-ticket-unclaim-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-unclaim-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:claim-ticket-unclaim-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.claim if (permissionMode == "none"){ @@ -225,7 +225,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -260,7 +260,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:claim-ticket-unclaim-message").failure.add([ - new api.ODWorker("opendiscord:back-to-unclaim-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-unclaim-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/clearTickets.ts b/src/actions/clearTickets.ts index f4b4630..688d656 100644 --- a/src/actions/clearTickets.ts +++ b/src/actions/clearTickets.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:clear-tickets")) opendiscord.actions.get("opendiscord:clear-tickets").workers.add([ - new api.ODWorker("opendiscord:clear-tickets",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:clear-tickets",2,async (instance,params,origin,cancel) => { const {guild,channel,user,filter,list} = params await opendiscord.events.get("onTicketsClear").emit([list,user,channel,filter]) @@ -43,21 +43,21 @@ export const registerActions = async () => { instance.list = nameList await opendiscord.events.get("afterTicketsCleared").emit([list,user,channel,filter]) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,filter,list} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.deleting.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:clear-logs").build(source,{guild,channel,user,filter,list:instance.list ?? []})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:clear-logs").build(origin,{guild,channel,user,filter,list:instance.list ?? []})) } }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,user,filter,list} = params opendiscord.log(user.displayName+" cleared "+list.length+" tickets!","info",[ {key:"user",value:user.username}, {key:"userid",value:user.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"filter",value:filter} ]) }) diff --git a/src/actions/closeTicket.ts b/src/actions/closeTicket.ts index 5f9dd4c..52253b2 100644 --- a/src/actions/closeTicket.ts +++ b/src/actions/closeTicket.ts @@ -10,7 +10,7 @@ const lang = opendiscord.languages export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:close-ticket")) opendiscord.actions.get("opendiscord:close-ticket").workers.add([ - new api.ODWorker("opendiscord:close-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:close-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to close ticket! Open Ticket doesn't support threads!") @@ -25,7 +25,7 @@ export const registerActions = async () => { ticket.get("opendiscord:reopened-by").value = null ticket.get("opendiscord:reopened-on").value = null - if (source == "autoclose") ticket.get("opendiscord:autoclosed").value = true + if (origin == "autoclose") ticket.get("opendiscord:autoclosed").value = true ticket.get("opendiscord:open").value = false ticket.get("opendiscord:busy").value = true @@ -126,27 +126,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:close-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:close-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketClosed").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.closing.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"close",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"close",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.closing.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"close",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.closing.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"close",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" closed a ticket!","info",[ @@ -155,7 +155,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -169,7 +169,7 @@ export const registerVerifyBars = async () => { //CLOSE TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:close-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:close-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -231,7 +231,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:close-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -250,7 +250,7 @@ export const registerVerifyBars = async () => { //CLOSE TICKET REOPEN MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:close-ticket-reopen-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-reopen-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:close-ticket-reopen-message").success.add([ - new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -312,7 +312,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:close-ticket-reopen-message").failure.add([ - new api.ODWorker("opendiscord:back-to-reopen-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-reopen-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/createTicket.ts b/src/actions/createTicket.ts index faf12fc..2429a95 100644 --- a/src/actions/createTicket.ts +++ b/src/actions/createTicket.ts @@ -10,7 +10,7 @@ const lang = opendiscord.languages export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:create-ticket")) opendiscord.actions.get("opendiscord:create-ticket").workers.add([ - new api.ODWorker("opendiscord:create-ticket",3,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:create-ticket",3,async (instance,params,origin,cancel) => { const {guild,user,answers,option} = params await opendiscord.events.get("onTicketCreate").emit([user]) @@ -197,7 +197,7 @@ export const registerActions = async () => { instance.ticket = ticket opendiscord.tickets.add(ticket) }), - new api.ODWorker("opendiscord:send-ticket-message",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:send-ticket-message",2,async (instance,params,origin,cancel) => { const {guild,user,answers,option} = params const {ticket,channel} = instance @@ -207,7 +207,7 @@ export const registerActions = async () => { //check if ticket message is enabled if (!option.get("opendiscord:ticket-message-enabled").value) return try { - const msg = await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build(source,{guild,channel,user,ticket})).message) + const msg = await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build(origin,{guild,channel,user,ticket})).message) ticket.get("opendiscord:ticket-message").value = msg.id @@ -225,7 +225,7 @@ export const registerActions = async () => { } await opendiscord.events.get("afterTicketCreated").emit([ticket,user,channel]) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,user,answers,option} = params const {ticket,channel} = instance @@ -234,13 +234,13 @@ export const registerActions = async () => { //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.creation.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created-logs").build(source,{guild,channel,user,ticket})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created-logs").build(origin,{guild,channel,user,ticket})) } //to dm - if (generalConfig.data.system.messages.creation.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:ticket-created-dm").build(source,{guild,channel,user,ticket})) + if (generalConfig.data.system.messages.creation.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:ticket-created-dm").build(origin,{guild,channel,user,ticket})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,user,answers,option} = params const {ticket,channel} = instance @@ -251,7 +251,7 @@ export const registerActions = async () => { {key:"userid",value:user.id,hidden:true}, {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"option",value:option.id.value} ]) }) diff --git a/src/actions/createTicketPermissions.ts b/src/actions/createTicketPermissions.ts index 60f9a2a..9202e4c 100644 --- a/src/actions/createTicketPermissions.ts +++ b/src/actions/createTicketPermissions.ts @@ -7,7 +7,7 @@ import * as discord from "discord.js" export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:create-ticket-permissions")) opendiscord.actions.get("opendiscord:create-ticket-permissions").workers.add([ - new api.ODWorker("opendiscord:check-blacklist",4,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:check-blacklist",4,(instance,params,origin,cancel) => { if (!params.option.get("opendiscord:allow-blacklisted-users").value && opendiscord.blacklist.exists(params.user.id)){ instance.valid = false instance.reason = "blacklist" @@ -19,7 +19,7 @@ export const registerActions = async () => { return cancel() } }), - new api.ODWorker("opendiscord:check-cooldown",3,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:check-cooldown",3,(instance,params,origin,cancel) => { const cooldown = opendiscord.cooldowns.get("opendiscord:option-cooldown_"+params.option.id.value) if (cooldown && cooldown instanceof api.ODTimeoutCooldown && cooldown.use(params.user.id)){ instance.valid = false @@ -36,7 +36,7 @@ export const registerActions = async () => { return cancel() } }), - new api.ODWorker("opendiscord:check-global-limits",2,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:check-global-limits",2,(instance,params,origin,cancel) => { const generalConfig = opendiscord.configs.get("opendiscord:general") if (!generalConfig.data.system.limits.enabled) return @@ -67,7 +67,7 @@ export const registerActions = async () => { return cancel() } }), - new api.ODWorker("opendiscord:check-option-limits",1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:check-option-limits",1,(instance,params,origin,cancel) => { if (!params.option.exists("opendiscord:limits-enabled") || !params.option.get("opendiscord:limits-enabled").value) return const allTickets = opendiscord.tickets.getFiltered((ticket) => ticket.option.id.value == params.option.id.value) @@ -97,7 +97,7 @@ export const registerActions = async () => { return cancel() } }), - new api.ODWorker("opendiscord:valid",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:valid",0,(instance,params,origin,cancel) => { instance.valid = true instance.reason = null cancel() diff --git a/src/actions/createTranscript.ts b/src/actions/createTranscript.ts index 23c9a90..bd7f7f0 100644 --- a/src/actions/createTranscript.ts +++ b/src/actions/createTranscript.ts @@ -9,7 +9,7 @@ const transcriptConfig = opendiscord.configs.get("opendiscord:transcripts") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:create-transcript")) opendiscord.actions.get("opendiscord:create-transcript").workers.add([ - new api.ODWorker("opendiscord:select-compiler",4,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:select-compiler",4,async (instance,params,origin,cancel) => { const {channel,user,ticket} = params if (channel.type != discord.ChannelType.GuildText) return cancel() if (!transcriptConfig.data.general.enabled) return cancel() @@ -29,7 +29,7 @@ export const registerActions = async () => { if (transcriptConfig.data.general.mode == "text") instance.compiler = opendiscord.transcripts.get("opendiscord:text-compiler") else if (transcriptConfig.data.general.mode == "html") instance.compiler = opendiscord.transcripts.get("opendiscord:html-compiler") }), - new api.ODWorker("opendiscord:init-transcript",3,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:init-transcript",3,async (instance,params,origin,cancel) => { const {channel,user,ticket} = params if (channel.type != discord.ChannelType.GuildText) return cancel() if (!transcriptConfig.data.general.enabled) return cancel() @@ -68,7 +68,7 @@ export const registerActions = async () => { } await opendiscord.events.get("afterTranscriptInitiated").emit([opendiscord.transcripts,ticket,channel,user]) }), - new api.ODWorker("opendiscord:compile-transcript",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:compile-transcript",2,async (instance,params,origin,cancel) => { const {channel,user,ticket} = params if (channel.type != discord.ChannelType.GuildText) return cancel() if (!instance.compiler){ @@ -103,7 +103,7 @@ export const registerActions = async () => { } await opendiscord.events.get("afterTranscriptCompiled").emit([opendiscord.transcripts,ticket,channel,user]) }), - new api.ODWorker("opendiscord:ready-transcript",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:ready-transcript",1,async (instance,params,origin,cancel) => { if (!instance.compiler){ instance.success = false cancel() @@ -179,7 +179,7 @@ export const registerActions = async () => { await opendiscord.statistics.get("opendiscord:user").setStat("opendiscord:transcripts-created",params.user.id,1,"increase") await opendiscord.events.get("afterTranscriptCreated").emit([opendiscord.transcripts,instance.result.ticket,instance.result.channel,instance.result.user]) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {user,channel,ticket} = params opendiscord.log(user.displayName+" created a transcript!","info",[ {key:"user",value:user.username}, @@ -187,7 +187,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"option",value:ticket.option.id.value}, - {key:"method",value:source,hidden:true}, + {key:"method",value:origin,hidden:true}, {key:"compiler",value:instance.compiler?.id.value ?? ""}, ]) }) diff --git a/src/actions/deleteTicket.ts b/src/actions/deleteTicket.ts index 48e715e..5a601ca 100644 --- a/src/actions/deleteTicket.ts +++ b/src/actions/deleteTicket.ts @@ -10,7 +10,7 @@ const lang = opendiscord.languages export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:delete-ticket")) opendiscord.actions.get("opendiscord:delete-ticket").workers.add([ - new api.ODWorker("opendiscord:delete-ticket",3,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",3,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to delete ticket! Open Ticket doesn't support threads!") @@ -36,15 +36,15 @@ export const registerActions = async () => { } } - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build(origin,{guild,channel,user,ticket,reason})).message) //create transcript if (!params.withoutTranscript){ - const transcriptRes = await opendiscord.actions.get("opendiscord:create-transcript").run(source,{guild,channel,user,ticket}) + const transcriptRes = await opendiscord.actions.get("opendiscord:create-transcript").run(origin,{guild,channel,user,ticket}) //transcript failure if (typeof transcriptRes.success == "boolean" && !transcriptRes.success && transcriptRes.compiler){ const {compiler} = transcriptRes - await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:transcript-error").build(source,{guild,channel,user,ticket,compiler,reason:transcriptRes.errorReason ?? null})).message) + await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:transcript-error").build(origin,{guild,channel,user,ticket,compiler,reason:transcriptRes.errorReason ?? null})).message) .catch((reason) => opendiscord.log("Unable to send transcript failure to ticket channel!","error",[{key:"id",value:channel.id}])) //undo deletion @@ -68,21 +68,21 @@ export const registerActions = async () => { //delete permissions from manager await (await import("../data/framework/permissionLoader.js")).removeTicketPermissions(ticket) }), - new api.ODWorker("opendiscord:discord-logs",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",2,async (instance,params,origin,cancel) => { //logs before channel deletion => channel might still be used in log embeds const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.deleting.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"delete",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"delete",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.deleting.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"delete",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.deleting.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"delete",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:delete-channel",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-channel",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //delete channel & events await opendiscord.events.get("onTicketChannelDeletion").emit([ticket,channel,user]) @@ -94,7 +94,7 @@ export const registerActions = async () => { await opendiscord.events.get("afterTicketDeleted").emit([ticket,user,reason]) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" deleted a ticket!","info",[ @@ -103,7 +103,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"transcript",value:(!params.withoutTranscript).toString()}, ]) }) @@ -119,7 +119,7 @@ export const registerVerifyBars = async () => { //DELETE TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:delete-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:delete-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -186,7 +186,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:delete-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -205,7 +205,7 @@ export const registerVerifyBars = async () => { //DELETE TICKET CLOSE MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:delete-ticket-close-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-close-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:delete-ticket-close-message").success.add([ - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -272,7 +272,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:delete-ticket-close-message").failure.add([ - new api.ODWorker("opendiscord:back-to-close-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-close-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ @@ -295,7 +295,7 @@ export const registerVerifyBars = async () => { //DELETE TICKET REOPEN MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:delete-ticket-reopen-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-reopen-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:delete-ticket-reopen-message").success.add([ - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -361,7 +361,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:delete-ticket-reopen-message").failure.add([ - new api.ODWorker("opendiscord:back-to-reopen-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-reopen-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ @@ -384,7 +384,7 @@ export const registerVerifyBars = async () => { //DELETE TICKET AUTOCLOSE MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:delete-ticket-autoclose-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-autoclose-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:delete-ticket-autoclose-message").success.add([ - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -450,7 +450,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:delete-ticket-autoclose-message").failure.add([ - new api.ODWorker("opendiscord:back-to-autoclose-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-autoclose-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/handleTranscriptErrors.ts b/src/actions/handleTranscriptErrors.ts index 6ce3998..67454f2 100644 --- a/src/actions/handleTranscriptErrors.ts +++ b/src/actions/handleTranscriptErrors.ts @@ -9,15 +9,15 @@ export const registerButtonResponders = async () => { //TRANSCRIPT ERROR RETRY opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:transcript-error-retry",/^od:transcript-error-retry_([^_]+)/)) opendiscord.responders.buttons.get("opendiscord:transcript-error-retry").workers.add([ - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance - const originalSource = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:delete-ticket"]["origin"] + const originalOrigin = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:delete-ticket"]["origin"] //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.delete,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -42,13 +42,13 @@ export const registerButtonResponders = async () => { //start deleting ticket (without reason) await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason:"Transcript Error (Retried)",sendMessage:false,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason:"Transcript Error (Retried)",sendMessage:false,withoutTranscript:false}) //update ticket (for ticket message) => no-await doesn't wait for the action to set this variable ticket.get("opendiscord:for-deletion").value = true await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build("other",{guild,channel,user,ticket,reason:"Transcript Error (Retried)"})) }), - new api.ODWorker("opendiscord:logs",-1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,async (instance,params,origin,cancel) => { const {user,channel} = instance if (channel.isDMBased()) return opendiscord.log(user.displayName+" retried deleting a ticket with transcript!","info",[ @@ -56,7 +56,7 @@ export const registerButtonResponders = async () => { {key:"userid",value:user.id,hidden:true}, {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -64,7 +64,7 @@ export const registerButtonResponders = async () => { //TRANSCRIPT ERROR CONTINUE opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:transcript-error-continue",/^od:transcript-error-continue_([^_]+)/)) opendiscord.responders.buttons.get("opendiscord:transcript-error-continue").workers.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.delete if (permissionMode == "none"){ @@ -97,9 +97,9 @@ export const registerButtonResponders = async () => { }else return } }), - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance - const originalSource = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:delete-ticket"]["origin"] + const originalOrigin = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:delete-ticket"]["origin"] if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -119,13 +119,13 @@ export const registerButtonResponders = async () => { //start deleting ticket (without reason) await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason:"Transcript Error (Continued)",sendMessage:false,withoutTranscript:true}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason:"Transcript Error (Continued)",sendMessage:false,withoutTranscript:true}) //update ticket (for ticket message) => no-await doesn't wait for the action to set this variable ticket.get("opendiscord:for-deletion").value = true await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build("other",{guild,channel,user,ticket,reason:"Transcript Error (Continued)"})) }), - new api.ODWorker("opendiscord:logs",-1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,async (instance,params,origin,cancel) => { const {user,channel} = instance if (channel.isDMBased()) return opendiscord.log(user.displayName+" continued deleting a ticket without transcript!","info",[ @@ -133,7 +133,7 @@ export const registerButtonResponders = async () => { {key:"userid",value:user.id,hidden:true}, {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/handleVerifyBar.ts b/src/actions/handleVerifyBar.ts index 68983f1..c0c3be6 100644 --- a/src/actions/handleVerifyBar.ts +++ b/src/actions/handleVerifyBar.ts @@ -7,7 +7,7 @@ export const registerButtonResponders = async () => { //VERIFYBAR SUCCESS opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:verifybar-success",/^od:verifybar-success_([^_]+)/)) opendiscord.responders.buttons.get("opendiscord:verifybar-success").workers.add( - new api.ODWorker("opendiscord:handle-verifybar",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:handle-verifybar",0,async (instance,params,origin,cancel) => { const id = instance.interaction.customId.split("_")[1] const customData = instance.interaction.customId.split("_")[2] as string|undefined @@ -20,7 +20,7 @@ export const registerButtonResponders = async () => { //VERIFYBAR FAILURE opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:verifybar-failure",/^od:verifybar-failure_([^_]+)/)) opendiscord.responders.buttons.get("opendiscord:verifybar-failure").workers.add( - new api.ODWorker("opendiscord:handle-verifybar",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:handle-verifybar",0,async (instance,params,origin,cancel) => { const id = instance.interaction.customId.split("_")[1] const customData = instance.interaction.customId.split("_")[2] as string|undefined diff --git a/src/actions/moveTicket.ts b/src/actions/moveTicket.ts index 9e035bd..cdd3754 100644 --- a/src/actions/moveTicket.ts +++ b/src/actions/moveTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:move-ticket")) opendiscord.actions.get("opendiscord:move-ticket").workers.add([ - new api.ODWorker("opendiscord:move-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:move-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params if (channel.isThread()) throw new api.ODSystemError("Unable to move ticket! Open Ticket doesn't support threads!") @@ -184,27 +184,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:move-message").build(source,{guild,channel,user,ticket,reason,data})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:move-message").build(origin,{guild,channel,user,ticket,reason,data})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketMoved").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.moving.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"move",reason,additionalData:data})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"move",reason,additionalData:data})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.moving.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"move",reason,additionalData:data})) + if (creator && generalConfig.data.system.messages.moving.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"move",reason,additionalData:data})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" moved a ticket!","info",[ @@ -213,7 +213,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/pinTicket.ts b/src/actions/pinTicket.ts index cbaa033..42d224c 100644 --- a/src/actions/pinTicket.ts +++ b/src/actions/pinTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:pin-ticket")) opendiscord.actions.get("opendiscord:pin-ticket").workers.add([ - new api.ODWorker("opendiscord:pin-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:pin-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to pin ticket! Open Ticket doesn't support threads!") @@ -61,27 +61,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:pin-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:pin-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketPinned").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.pinning.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"pin",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"pin",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.pinning.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"pin",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.pinning.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"pin",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" pinned a ticket!","info",[ @@ -90,7 +90,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -100,7 +100,7 @@ export const registerVerifyBars = async () => { //PIN TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:pin-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:pin-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.pin if (permissionMode == "none"){ @@ -133,7 +133,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -168,7 +168,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:pin-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -187,7 +187,7 @@ export const registerVerifyBars = async () => { //PIN TICKET UNPIN MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:pin-ticket-unpin-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-unpin-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:pin-ticket-unpin-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.pin if (permissionMode == "none"){ @@ -220,7 +220,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -255,7 +255,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:pin-ticket-unpin-message").failure.add([ - new api.ODWorker("opendiscord:back-to-unpin-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-unpin-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/reactionRole.ts b/src/actions/reactionRole.ts index 33745ef..d4081ee 100644 --- a/src/actions/reactionRole.ts +++ b/src/actions/reactionRole.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:reaction-role")) opendiscord.actions.get("opendiscord:reaction-role").workers.add([ - new api.ODWorker("opendiscord:reaction-role",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reaction-role",2,async (instance,params,origin,cancel) => { const {guild,user,option,overwriteMode} = params const role = opendiscord.roles.get(option.id) if (!role) throw new api.ODSystemError("ODAction(ot:reaction-role) => Unknown reaction role (ODRole)") @@ -83,25 +83,25 @@ export const registerActions = async () => { instance.result = result await opendiscord.events.get("afterRolesUpdated").emit([user,role]) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,user,option,overwriteMode} = params if (!instance.role || !instance.result) return //to logs if (generalConfig.data.system.logs.enabled && (generalConfig.data.system.messages.reactionRole.logs)){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:reaction-role-logs").build(source,{guild,user,role:instance.role,result:instance.result})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:reaction-role-logs").build(origin,{guild,user,role:instance.role,result:instance.result})) } //to dm - if (generalConfig.data.system.messages.reactionRole.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:reaction-role-dm").build(source,{guild,user,role:instance.role,result:instance.result})) + if (generalConfig.data.system.messages.reactionRole.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:reaction-role-dm").build(origin,{guild,user,role:instance.role,result:instance.result})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,user,option} = params opendiscord.log(user.displayName+" updated his roles!","info",[ {key:"user",value:user.username}, {key:"userid",value:user.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"option",value:option.id.value} ]) }) diff --git a/src/actions/removeTicketUser.ts b/src/actions/removeTicketUser.ts index 5c8ef74..25e0640 100644 --- a/src/actions/removeTicketUser.ts +++ b/src/actions/removeTicketUser.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:remove-ticket-user")) opendiscord.actions.get("opendiscord:remove-ticket-user").workers.add([ - new api.ODWorker("opendiscord:remove-ticket-user",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:remove-ticket-user",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params if (channel.isThread()) throw new api.ODSystemError("Unable to remove user from ticket! Open Ticket doesn't support threads!") @@ -45,27 +45,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:remove-message").build(source,{guild,channel,user,ticket,reason,data})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:remove-message").build(origin,{guild,channel,user,ticket,reason,data})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketUserRemoved").emit([ticket,user,data,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.removing.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"remove",reason,additionalData:data})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"remove",reason,additionalData:data})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.removing.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"remove",reason,additionalData:data})) + if (creator && generalConfig.data.system.messages.removing.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"remove",reason,additionalData:data})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket,data} = params opendiscord.log(user.displayName+" removed "+data.displayName+" from a ticket!","info",[ @@ -74,7 +74,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/renameTicket.ts b/src/actions/renameTicket.ts index 4a25d28..81436c0 100644 --- a/src/actions/renameTicket.ts +++ b/src/actions/renameTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:rename-ticket")) opendiscord.actions.get("opendiscord:rename-ticket").workers.add([ - new api.ODWorker("opendiscord:rename-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:rename-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params if (channel.isThread()) throw new api.ODSystemError("Unable to rename ticket! Open Ticket doesn't support threads!") @@ -46,27 +46,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:rename-message").build(source,{guild,channel,user,ticket,reason,data})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:rename-message").build(origin,{guild,channel,user,ticket,reason,data})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketRenamed").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,data} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.renaming.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"rename",reason,additionalData:data})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"rename",reason,additionalData:data})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.renaming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"rename",reason,additionalData:data})) + if (creator && generalConfig.data.system.messages.renaming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"rename",reason,additionalData:data})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" renamed a ticket!","info",[ @@ -75,7 +75,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/reopenTicket.ts b/src/actions/reopenTicket.ts index 3d3a0bc..0420bae 100644 --- a/src/actions/reopenTicket.ts +++ b/src/actions/reopenTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:reopen-ticket")) opendiscord.actions.get("opendiscord:reopen-ticket").workers.add([ - new api.ODWorker("opendiscord:reopen-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to reopen ticket! Open Ticket doesn't support threads!") @@ -157,27 +157,27 @@ export const registerActions = async () => { } } - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketReopened").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.reopening.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"reopen",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"reopen",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.reopening.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"reopen",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.reopening.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"reopen",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" reopened a ticket!","info",[ @@ -186,7 +186,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -196,7 +196,7 @@ export const registerVerifyBars = async () => { //REOPEN TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:reopen-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:reopen-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.reopen if (permissionMode == "none"){ @@ -229,7 +229,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -264,7 +264,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:reopen-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -283,7 +283,7 @@ export const registerVerifyBars = async () => { //REOPEN TICKET CLOSE MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:reopen-ticket-close-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-close-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:reopen-ticket-close-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.reopen if (permissionMode == "none"){ @@ -316,7 +316,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -351,7 +351,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:reopen-ticket-close-message").failure.add([ - new api.ODWorker("opendiscord:back-to-close-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-close-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ @@ -374,7 +374,7 @@ export const registerVerifyBars = async () => { //REOPEN TICKET AUTOCLOSE MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:reopen-ticket-autoclose-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-autoclose-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:reopen-ticket-autoclose-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.reopen if (permissionMode == "none"){ @@ -407,7 +407,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -442,7 +442,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:reopen-ticket-autoclose-message").failure.add([ - new api.ODWorker("opendiscord:back-to-autoclose-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-autoclose-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/transferTicket.ts b/src/actions/transferTicket.ts index f668e68..f831986 100644 --- a/src/actions/transferTicket.ts +++ b/src/actions/transferTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:transfer-ticket")) opendiscord.actions.get("opendiscord:transfer-ticket").workers.add([ - new api.ODWorker("opendiscord:transfer-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:transfer-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason,newCreator} = params if (channel.isThread()) throw new api.ODSystemError("Unable to transfer ticket! Open Ticket doesn't support threads!") @@ -124,17 +124,17 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:transfer-message").build(source,{guild,channel,user,ticket,oldCreator,newCreator,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:transfer-message").build(origin,{guild,channel,user,ticket,oldCreator,newCreator,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketTransferred").emit([ticket,user,channel,oldCreator,newCreator,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,newCreator,reason} = params }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket,newCreator} = params opendiscord.log(user.displayName+" transferred a ticket to '"+newCreator.displayName+"'!","info",[ @@ -143,7 +143,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/unclaimTicket.ts b/src/actions/unclaimTicket.ts index 8b0725c..388e9ec 100644 --- a/src/actions/unclaimTicket.ts +++ b/src/actions/unclaimTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:unclaim-ticket")) opendiscord.actions.get("opendiscord:unclaim-ticket").workers.add([ - new api.ODWorker("opendiscord:unclaim-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unclaim-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to unclaim ticket! Open Ticket doesn't support threads!") @@ -91,27 +91,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:unclaim-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:unclaim-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketUnclaimed").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.claiming.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"unclaim",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"unclaim",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.claiming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"unclaim",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.claiming.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"unclaim",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" unclaimed a ticket!","info",[ @@ -120,7 +120,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -130,7 +130,7 @@ export const registerVerifyBars = async () => { //UNCLAIM TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:unclaim-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:unclaim-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.unclaim if (permissionMode == "none"){ @@ -163,7 +163,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -198,7 +198,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:unclaim-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -217,7 +217,7 @@ export const registerVerifyBars = async () => { //UNCLAIM TICKET CLAIM MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:unclaim-ticket-claim-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-claim-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:unclaim-ticket-claim-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.unclaim if (permissionMode == "none"){ @@ -250,7 +250,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -285,7 +285,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:unclaim-ticket-claim-message").failure.add([ - new api.ODWorker("opendiscord:back-to-claim-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-claim-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/unpinTicket.ts b/src/actions/unpinTicket.ts index b2f459c..c8b36d2 100644 --- a/src/actions/unpinTicket.ts +++ b/src/actions/unpinTicket.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:unpin-ticket")) opendiscord.actions.get("opendiscord:unpin-ticket").workers.add([ - new api.ODWorker("opendiscord:unpin-ticket",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unpin-ticket",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params if (channel.isThread()) throw new api.ODSystemError("Unable to unpin ticket! Open Ticket doesn't support threads!") @@ -52,27 +52,27 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:unpin-message").build(source,{guild,channel,user,ticket,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:unpin-message").build(origin,{guild,channel,user,ticket,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketUnpinned").emit([ticket,user,channel,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,reason} = params //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.pinning.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,ticket,mode:"unpin",reason,additionalData:null})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,ticket,mode:"unpin",reason,additionalData:null})) } //to dm const creator = await opendiscord.tickets.getTicketUser(ticket,"creator") - if (creator && generalConfig.data.system.messages.pinning.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,ticket,mode:"unpin",reason,additionalData:null})) + if (creator && generalConfig.data.system.messages.pinning.dm) await opendiscord.client.sendUserDm(creator,await opendiscord.builders.messages.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,ticket,mode:"unpin",reason,additionalData:null})) }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params opendiscord.log(user.displayName+" unpinned a ticket!","info",[ @@ -81,7 +81,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"reason",value:params.reason ?? "/"}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -91,7 +91,7 @@ export const registerVerifyBars = async () => { //UNPIN TICKET TICKET MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:unpin-ticket-ticket-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-ticket-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:unpin-ticket-ticket-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.unpin if (permissionMode == "none"){ @@ -124,7 +124,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -159,7 +159,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:unpin-ticket-ticket-message").failure.add([ - new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-ticket-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -178,7 +178,7 @@ export const registerVerifyBars = async () => { //UNPIN TICKET PIN MESSAGE opendiscord.verifybars.add(new api.ODVerifyBar("opendiscord:unpin-ticket-pin-message",opendiscord.builders.messages.getSafe("opendiscord:verifybar-pin-message"),!generalConfig.data.system.disableVerifyBars)) opendiscord.verifybars.get("opendiscord:unpin-ticket-pin-message").success.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.unpin if (permissionMode == "none"){ @@ -211,7 +211,7 @@ export const registerVerifyBars = async () => { }else return } }), - new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) @@ -246,7 +246,7 @@ export const registerVerifyBars = async () => { }) ]) opendiscord.verifybars.get("opendiscord:unpin-ticket-pin-message").failure.add([ - new api.ODWorker("opendiscord:back-to-pin-message",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:back-to-pin-message",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance const {verifybarMessage} = params if (!guild){ diff --git a/src/actions/updateTicketPriority.ts b/src/actions/updateTicketPriority.ts index 5224672..612ff1a 100644 --- a/src/actions/updateTicketPriority.ts +++ b/src/actions/updateTicketPriority.ts @@ -9,7 +9,7 @@ const generalConfig = opendiscord.configs.get("opendiscord:general") export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:update-ticket-priority")) opendiscord.actions.get("opendiscord:update-ticket-priority").workers.add([ - new api.ODWorker("opendiscord:update-ticket-priority",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:update-ticket-priority",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,newPriority,reason} = params if (channel.isThread() || !(channel instanceof discord.TextChannel)) throw new api.ODSystemError("Unable to set priority of ticket! Open Ticket doesn't support threads!") @@ -35,17 +35,17 @@ export const registerActions = async () => { } //reply with new message - if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:priority-set").build(source,{guild,channel,user,ticket,priority:newPriority,reason})).message) + if (params.sendMessage) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:priority-set").build(origin,{guild,channel,user,ticket,priority:newPriority,reason})).message) ticket.get("opendiscord:busy").value = false await opendiscord.events.get("afterTicketPriorityChanged").emit([ticket,user,channel,oldPriority,newPriority,reason]) //update channel topic await opendiscord.actions.get("opendiscord:update-ticket-topic").run("ticket-action",{guild,channel,user,ticket,sendMessage:false,newTopic:null}) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket,newPriority} = params opendiscord.log(user.displayName+" changed the priority of a ticket!","info",[ @@ -54,7 +54,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"priority",value:newPriority.id.value}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/actions/updateTicketTopic.ts b/src/actions/updateTicketTopic.ts index 992b920..e6691a1 100644 --- a/src/actions/updateTicketTopic.ts +++ b/src/actions/updateTicketTopic.ts @@ -10,7 +10,7 @@ const lang = opendiscord.languages export const registerActions = async () => { opendiscord.actions.add(new api.ODAction("opendiscord:update-ticket-topic")) opendiscord.actions.get("opendiscord:update-ticket-topic").workers.add([ - new api.ODWorker("opendiscord:update-ticket-topic",2,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:update-ticket-topic",2,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket,newTopic} = params if (channel.isThread() || !(channel instanceof discord.TextChannel)) throw new api.ODSystemError("Unable to set topic of ticket! Open Ticket doesn't support threads!") @@ -43,14 +43,14 @@ export const registerActions = async () => { channel.setTopic(channelTopics.join(" • "),"Topic Changed") //reply with new message - if (params.sendMessage && newTopic) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:topic-set").build(source,{guild,channel,user,ticket,topic:newTopic})).message) + if (params.sendMessage && newTopic) await channel.send((await opendiscord.builders.messages.getSafe("opendiscord:topic-set").build(origin,{guild,channel,user,ticket,topic:newTopic})).message) ticket.get("opendiscord:busy").value = false if (newTopic) await opendiscord.events.get("afterTicketTopicChanged").emit([ticket,user,channel,oldTopic,newTopic]) }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user,ticket} = params }), - new api.ODWorker("opendiscord:logs",0,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",0,(instance,params,origin,cancel) => { const {guild,channel,user,ticket,newTopic} = params if (newTopic) opendiscord.log(user.displayName+" changed the topic of a ticket!","info",[ @@ -59,7 +59,7 @@ export const registerActions = async () => { {key:"channel",value:"#"+channel.name}, {key:"channelid",value:channel.id,hidden:true}, {key:"topic",value:newTopic}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/builders/buttons.ts b/src/builders/buttons.ts index c487471..77ed3a1 100644 --- a/src/builders/buttons.ts +++ b/src/builders/buttons.ts @@ -201,11 +201,11 @@ const ticketButtons = () => { //CLOSE TICKET buttons.add(new api.ODButton("opendiscord:close-ticket")) buttons.get("opendiscord:close-ticket").workers.add( - new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:close-ticket_"+source) + instance.setCustomId("od:close-ticket_"+origin) instance.setColor("gray") instance.setEmoji("🔒") instance.setLabel(lang.getTranslation("actions.buttons.close")) @@ -215,11 +215,11 @@ const ticketButtons = () => { //DELETE TICKET buttons.add(new api.ODButton("opendiscord:delete-ticket")) buttons.get("opendiscord:delete-ticket").workers.add( - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:delete-ticket_"+source) + instance.setCustomId("od:delete-ticket_"+origin) instance.setColor("red") instance.setEmoji("✖") instance.setLabel(lang.getTranslation("actions.buttons.delete")) @@ -229,11 +229,11 @@ const ticketButtons = () => { //REOPEN TICKET buttons.add(new api.ODButton("opendiscord:reopen-ticket")) buttons.get("opendiscord:reopen-ticket").workers.add( - new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:reopen-ticket_"+source) + instance.setCustomId("od:reopen-ticket_"+origin) instance.setColor("green") instance.setEmoji("🔓") instance.setLabel(lang.getTranslation("actions.buttons.reopen")) @@ -243,11 +243,11 @@ const ticketButtons = () => { //CLAIM TICKET buttons.add(new api.ODButton("opendiscord:claim-ticket")) buttons.get("opendiscord:claim-ticket").workers.add( - new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:claim-ticket_"+source) + instance.setCustomId("od:claim-ticket_"+origin) instance.setColor("green") instance.setEmoji("👋") instance.setLabel(lang.getTranslation("actions.buttons.claim")) @@ -257,11 +257,11 @@ const ticketButtons = () => { //UNCLAIM TICKET buttons.add(new api.ODButton("opendiscord:unclaim-ticket")) buttons.get("opendiscord:unclaim-ticket").workers.add( - new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:unclaim-ticket_"+source) + instance.setCustomId("od:unclaim-ticket_"+origin) instance.setColor("green") instance.setEmoji("↩️") instance.setLabel(lang.getTranslation("actions.buttons.unclaim")) @@ -271,11 +271,11 @@ const ticketButtons = () => { //PIN TICKET buttons.add(new api.ODButton("opendiscord:pin-ticket")) buttons.get("opendiscord:pin-ticket").workers.add( - new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:pin-ticket_"+source) + instance.setCustomId("od:pin-ticket_"+origin) instance.setColor("gray") instance.setEmoji(generalConfig.data.system.pinEmoji) instance.setLabel(lang.getTranslation("actions.buttons.pin")) @@ -285,11 +285,11 @@ const ticketButtons = () => { //UNPIN TICKET buttons.add(new api.ODButton("opendiscord:unpin-ticket")) buttons.get("opendiscord:unpin-ticket").workers.add( - new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,origin) => { const {guild,channel,ticket} = params instance.setMode("button") - instance.setCustomId("od:unpin-ticket_"+source) + instance.setCustomId("od:unpin-ticket_"+origin) instance.setColor("gray") instance.setEmoji(generalConfig.data.system.pinEmoji) instance.setLabel(lang.getTranslation("actions.buttons.unpin")) @@ -301,7 +301,7 @@ const transcriptButtons = () => { //TRANSCRIPT HTML VISIT buttons.add(new api.ODButton("opendiscord:transcript-html-visit")) buttons.get("opendiscord:transcript-html-visit").workers.add( - new api.ODWorker("opendiscord:transcript-html-visit",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-html-visit",0,async (instance,params,origin) => { const {result} = params instance.setMode("url") if (result.data) instance.setUrl(result.data.url) @@ -314,9 +314,9 @@ const transcriptButtons = () => { //TRANSCRIPT ERROR RETRY buttons.add(new api.ODButton("opendiscord:transcript-error-retry")) buttons.get("opendiscord:transcript-error-retry").workers.add( - new api.ODWorker("opendiscord:transcript-error-retry",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-error-retry",0,async (instance,params,origin) => { instance.setMode("button") - instance.setCustomId("od:transcript-error-retry_"+source) + instance.setCustomId("od:transcript-error-retry_"+origin) instance.setColor("gray") instance.setEmoji("🔄") instance.setLabel(lang.getTranslation("transcripts.errors.retry")) @@ -326,9 +326,9 @@ const transcriptButtons = () => { //TRANSCRIPT ERROR CONTINUE buttons.add(new api.ODButton("opendiscord:transcript-error-continue")) buttons.get("opendiscord:transcript-error-continue").workers.add( - new api.ODWorker("opendiscord:transcript-error-continue",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-error-continue",0,async (instance,params,origin) => { instance.setMode("button") - instance.setCustomId("od:transcript-error-continue_"+source) + instance.setCustomId("od:transcript-error-continue_"+origin) instance.setColor("red") instance.setEmoji("✖") instance.setLabel(lang.getTranslation("transcripts.errors.continue")) @@ -340,9 +340,9 @@ const clearButtons = () => { //CLEAR CONTINUE buttons.add(new api.ODButton("opendiscord:clear-continue")) buttons.get("opendiscord:clear-continue").workers.add( - new api.ODWorker("opendiscord:clear-continue",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-continue",0,async (instance,params,origin) => { instance.setMode("button") - instance.setCustomId("od:clear-continue_"+source+"_"+params.filter) + instance.setCustomId("od:clear-continue_"+origin+"_"+params.filter) instance.setColor("red") instance.setEmoji("✖") instance.setLabel(lang.getTranslation("actions.buttons.clear")) diff --git a/src/builders/embeds.ts b/src/builders/embeds.ts index 2adfb07..984ec68 100644 --- a/src/builders/embeds.ts +++ b/src/builders/embeds.ts @@ -23,12 +23,12 @@ export const registerAllEmbeds = async () => { extraEmbeds() } -/**Utility function to get the translated "method" from the source. Mostly used in error embeds. */ -const getMethodFromSource = (source:"slash"|"text"|"button"|"dropdown"|"modal"|"other"): string => { - if (source == "slash" || source == "text") return lang.getTranslation("params.lowercase.command") - else if (source == "button") return lang.getTranslation("params.lowercase.button") - else if (source == "dropdown") return lang.getTranslation("params.lowercase.dropdown") - else if (source == "modal") return lang.getTranslation("params.lowercase.modal") +/**Utility function to get the translated "method" from the origin. Mostly used in error embeds. */ +const getMethodFromOrigin = (origin:"slash"|"text"|"button"|"dropdown"|"modal"|"other"): string => { + if (origin == "slash" || origin == "text") return lang.getTranslation("params.lowercase.command") + else if (origin == "button") return lang.getTranslation("params.lowercase.button") + else if (origin == "dropdown") return lang.getTranslation("params.lowercase.dropdown") + else if (origin == "modal") return lang.getTranslation("params.lowercase.modal") else return lang.getTranslation("params.lowercase.method") } //lang.getTranslation() @@ -37,10 +37,10 @@ const errorEmbeds = () => { //ERROR embeds.add(new api.ODEmbed("opendiscord:error")) embeds.get("opendiscord:error").workers.add( - new api.ODWorker("opendiscord:error",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error",0,async (instance,params,origin) => { const {user,error,layout,customTitle} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",customTitle ?? lang.getTranslation("errors.titles.internalError"))) @@ -154,10 +154,10 @@ const errorEmbeds = () => { //ERROR NO PERMISSIONS embeds.add(new api.ODEmbed("opendiscord:error-no-permissions")) embeds.get("opendiscord:error-no-permissions").workers.add( - new api.ODWorker("opendiscord:error-no-permissions",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions",0,async (instance,params,origin) => { const {user,permissions} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) const renderedPerms = permissions.map((perm) => { if (perm == "developer") return "- "+lang.getTranslation("errors.permissions.developer") @@ -180,10 +180,10 @@ const errorEmbeds = () => { //ERROR NO PERMISSIONS COOLDOWN embeds.add(new api.ODEmbed("opendiscord:error-no-permissions-cooldown")) embeds.get("opendiscord:error-no-permissions-cooldown").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-cooldown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-cooldown",0,async (instance,params,origin) => { const {user} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.noPermissions"))) @@ -196,10 +196,10 @@ const errorEmbeds = () => { //ERROR NO PERMISSIONS BLACKLISTED embeds.add(new api.ODEmbed("opendiscord:error-no-permissions-blacklisted")) embeds.get("opendiscord:error-no-permissions-blacklisted").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-blacklisted",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-blacklisted",0,async (instance,params,origin) => { const {user} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.noPermissions"))) @@ -211,7 +211,7 @@ const errorEmbeds = () => { //ERROR NO PERMISSIONS LIMITS embeds.add(new api.ODEmbed("opendiscord:error-no-permissions-limits")) embeds.get("opendiscord:error-no-permissions-limits").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-limits",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-limits",0,async (instance,params,origin) => { const {user,limit} = params instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) @@ -227,10 +227,10 @@ const errorEmbeds = () => { //ERROR RESPONDER TIMEOUT embeds.add(new api.ODEmbed("opendiscord:error-responder-timeout")) embeds.get("opendiscord:error-responder-timeout").workers.add( - new api.ODWorker("opendiscord:error-responder-timeout",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-responder-timeout",0,async (instance,params,origin) => { const {user} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.internalError"))) @@ -244,7 +244,7 @@ const errorEmbeds = () => { //ERROR TICKET UNKNOWN embeds.add(new api.ODEmbed("opendiscord:error-ticket-unknown")) embeds.get("opendiscord:error-ticket-unknown").workers.add( - new api.ODWorker("opendiscord:error-ticket-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-unknown",0,async (instance,params,origin) => { const {user} = params instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) @@ -258,7 +258,7 @@ const errorEmbeds = () => { //ERROR TICKET DEPRECATED embeds.add(new api.ODEmbed("opendiscord:error-ticket-deprecated")) embeds.get("opendiscord:error-ticket-deprecated").workers.add( - new api.ODWorker("opendiscord:error-ticket-deprecated",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-deprecated",0,async (instance,params,origin) => { const {user} = params instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) @@ -272,7 +272,7 @@ const errorEmbeds = () => { //ERROR OPTION UNKNOWN embeds.add(new api.ODEmbed("opendiscord:error-option-unknown")) embeds.get("opendiscord:error-option-unknown").workers.add( - new api.ODWorker("opendiscord:error-option-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-option-unknown",0,async (instance,params,origin) => { const {user} = params const renderedTicketOptions = opendiscord.options.getAll().map((option) => { @@ -292,7 +292,7 @@ const errorEmbeds = () => { //ERROR PANEL UNKNOWN embeds.add(new api.ODEmbed("opendiscord:error-panel-unknown")) embeds.get("opendiscord:error-panel-unknown").workers.add( - new api.ODWorker("opendiscord:error-panel-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-panel-unknown",0,async (instance,params,origin) => { const {user} = params const renderedPanels = opendiscord.panels.getAll().map((panel) => { @@ -312,10 +312,10 @@ const errorEmbeds = () => { //ERROR NOT IN GUILD embeds.add(new api.ODEmbed("opendiscord:error-not-in-guild")) embeds.get("opendiscord:error-not-in-guild").workers.add( - new api.ODWorker("opendiscord:error-not-in-guild",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-not-in-guild",0,async (instance,params,origin) => { const {user} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.notInGuild"))) @@ -327,16 +327,16 @@ const errorEmbeds = () => { //ERROR CHANNEL RENAME embeds.add(new api.ODEmbed("opendiscord:error-channel-rename")) embeds.get("opendiscord:error-channel-rename").workers.add( - new api.ODWorker("opendiscord:error-channel-rename",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-channel-rename",0,async (instance,params,origin) => { const {channel,user,originalName,newName} = params - const method = (source == "ticket-move" || source == "ticket-pin" || source == "ticket-rename" || source == "ticket-unpin" || source == "ticket-priority" || source == "ticket-transfer") ? source : getMethodFromSource(source) + const method = (origin == "ticket-move" || origin == "ticket-pin" || origin == "ticket-rename" || origin == "ticket-unpin" || origin == "ticket-priority" || origin == "ticket-transfer") ? origin : getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.channelRename"))) instance.setAuthor(user.displayName,user.displayAvatarURL()) instance.setDescription(lang.getTranslation("errors.descriptions.channelRename")) - instance.setFooter(lang.getTranslationWithParams("errors.descriptions.channelRenameSource",[method])) + instance.setFooter(lang.getTranslationWithParams("errors.descriptions.channelRenameOrigin",[method])) instance.addFields( {name:lang.getTranslation("params.uppercase.originalName")+":",value:"```#"+originalName+"```",inline:false}, {name:lang.getTranslation("params.uppercase.newName")+":",value:"```#"+newName+"```",inline:false} @@ -347,10 +347,10 @@ const errorEmbeds = () => { //ERROR TICKET BUSY embeds.add(new api.ODEmbed("opendiscord:error-ticket-busy")) embeds.get("opendiscord:error-ticket-busy").workers.add( - new api.ODWorker("opendiscord:error-ticket-busy",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-busy",0,async (instance,params,origin) => { const {user} = params - const method = getMethodFromSource(source) + const method = getMethodFromOrigin(origin) instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) instance.setTitle(utilities.emojiTitle("❌",lang.getTranslation("errors.titles.busy"))) @@ -529,7 +529,7 @@ const ticketEmbeds = () => { //TICKET CREATED embeds.add(new api.ODEmbed("opendiscord:ticket-created")) embeds.get("opendiscord:ticket-created").workers.add( - new api.ODWorker("opendiscord:ticket-created",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created",0,async (instance,params,origin) => { const {user} = params instance.setColor(generalConfig.data.mainColor) @@ -543,7 +543,7 @@ const ticketEmbeds = () => { //TICKET CREATED DM embeds.add(new api.ODEmbed("opendiscord:ticket-created-dm")) embeds.get("opendiscord:ticket-created-dm").workers.add( - new api.ODWorker("opendiscord:ticket-created-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created-dm",0,async (instance,params,origin) => { const {user,ticket} = params const embedOptions = ticket.option.get("opendiscord:dm-message-embed").value @@ -563,10 +563,10 @@ const ticketEmbeds = () => { //TICKET CREATED LOGS embeds.add(new api.ODEmbed("opendiscord:ticket-created-logs")) embeds.get("opendiscord:ticket-created-logs").workers.add( - new api.ODWorker("opendiscord:ticket-created-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created-logs",0,async (instance,params,origin) => { const {user,ticket} = params - const method = (source == "panel-button" || source == "panel-dropdown") ? lang.getTranslation("params.uppercase.panel") : (source == "slash" || source == "text") ? lang.getTranslation("params.uppercase.command") : lang.getTranslation("params.uppercase.system") + const method = (origin == "panel-button" || origin == "panel-dropdown") ? lang.getTranslation("params.uppercase.panel") : (origin == "slash" || origin == "text") ? lang.getTranslation("params.uppercase.command") : lang.getTranslation("params.uppercase.system") const blacklisted = opendiscord.blacklist.exists(user.id) ? lang.getTranslation("params.uppercase.true") : lang.getTranslation("params.uppercase.false") instance.setColor(generalConfig.data.mainColor) @@ -586,7 +586,7 @@ const ticketEmbeds = () => { //TICKET MESSAGE embeds.add(new api.ODEmbed("opendiscord:ticket-message")) embeds.get("opendiscord:ticket-message").workers.add( - new api.ODWorker("opendiscord:ticket-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-message",0,async (instance,params,origin) => { const {user,ticket} = params const embedOptions = ticket.option.get("opendiscord:ticket-message-embed").value @@ -625,7 +625,7 @@ const ticketEmbeds = () => { //TICKET CLOSED embeds.add(new api.ODEmbed("opendiscord:close-message")) embeds.get("opendiscord:close-message").workers.add( - new api.ODWorker("opendiscord:close-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:close-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -639,7 +639,7 @@ const ticketEmbeds = () => { //TICKET REOPENED embeds.add(new api.ODEmbed("opendiscord:reopen-message")) embeds.get("opendiscord:reopen-message").workers.add( - new api.ODWorker("opendiscord:reopen-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reopen-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -653,7 +653,7 @@ const ticketEmbeds = () => { //TICKET DELETED embeds.add(new api.ODEmbed("opendiscord:delete-message")) embeds.get("opendiscord:delete-message").workers.add( - new api.ODWorker("opendiscord:delete-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:delete-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -667,7 +667,7 @@ const ticketEmbeds = () => { //TICKET CLAIMED embeds.add(new api.ODEmbed("opendiscord:claim-message")) embeds.get("opendiscord:claim-message").workers.add( - new api.ODWorker("opendiscord:claim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:claim-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -681,7 +681,7 @@ const ticketEmbeds = () => { //TICKET UNCLAIMED embeds.add(new api.ODEmbed("opendiscord:unclaim-message")) embeds.get("opendiscord:unclaim-message").workers.add( - new api.ODWorker("opendiscord:unclaim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unclaim-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -695,7 +695,7 @@ const ticketEmbeds = () => { //TICKET PINNED embeds.add(new api.ODEmbed("opendiscord:pin-message")) embeds.get("opendiscord:pin-message").workers.add( - new api.ODWorker("opendiscord:pin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:pin-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -709,7 +709,7 @@ const ticketEmbeds = () => { //TICKET UNPINNED embeds.add(new api.ODEmbed("opendiscord:unpin-message")) embeds.get("opendiscord:unpin-message").workers.add( - new api.ODWorker("opendiscord:unpin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unpin-message",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -723,7 +723,7 @@ const ticketEmbeds = () => { //TICKET RENAMED embeds.add(new api.ODEmbed("opendiscord:rename-message")) embeds.get("opendiscord:rename-message").workers.add( - new api.ODWorker("opendiscord:rename-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:rename-message",0,async (instance,params,origin) => { const {user,ticket,reason,data} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -737,7 +737,7 @@ const ticketEmbeds = () => { //TICKET MOVED embeds.add(new api.ODEmbed("opendiscord:move-message")) embeds.get("opendiscord:move-message").workers.add( - new api.ODWorker("opendiscord:move-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:move-message",0,async (instance,params,origin) => { const {user,ticket,reason,data} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -751,7 +751,7 @@ const ticketEmbeds = () => { //TICKET USER ADDED embeds.add(new api.ODEmbed("opendiscord:add-message")) embeds.get("opendiscord:add-message").workers.add( - new api.ODWorker("opendiscord:add-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:add-message",0,async (instance,params,origin) => { const {user,ticket,reason,data} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -765,7 +765,7 @@ const ticketEmbeds = () => { //TICKET USER REMOVED embeds.add(new api.ODEmbed("opendiscord:remove-message")) embeds.get("opendiscord:remove-message").workers.add( - new api.ODWorker("opendiscord:remove-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:remove-message",0,async (instance,params,origin) => { const {user,ticket,reason,data} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -779,7 +779,7 @@ const ticketEmbeds = () => { //TICKET ACTION DM embeds.add(new api.ODEmbed("opendiscord:ticket-action-dm")) embeds.get("opendiscord:ticket-action-dm").workers.add( - new api.ODWorker("opendiscord:ticket-action-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-action-dm",0,async (instance,params,origin) => { const {user,mode,ticket,reason,additionalData} = params const channel = await opendiscord.tickets.getTicketChannel(ticket) @@ -828,7 +828,7 @@ const ticketEmbeds = () => { //TICKET ACTION LOGS embeds.add(new api.ODEmbed("opendiscord:ticket-action-logs")) embeds.get("opendiscord:ticket-action-logs").workers.add( - new api.ODWorker("opendiscord:ticket-action-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-action-logs",0,async (instance,params,origin) => { const {user,mode,ticket,reason,additionalData} = params const channel = await opendiscord.tickets.getTicketChannel(ticket) @@ -884,7 +884,7 @@ const blacklistEmbeds = () => { //BLACKLIST VIEW embeds.add(new api.ODEmbed("opendiscord:blacklist-view")) embeds.get("opendiscord:blacklist-view").workers.add( - new api.ODWorker("opendiscord:blacklist-view",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-view",0,async (instance,params,origin) => { const {user} = params const renderedUsers: string[] = [] @@ -904,7 +904,7 @@ const blacklistEmbeds = () => { //BLACKLIST GET embeds.add(new api.ODEmbed("opendiscord:blacklist-get")) embeds.get("opendiscord:blacklist-get").workers.add( - new api.ODWorker("opendiscord:blacklist-get",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-get",0,async (instance,params,origin) => { const {user,data} = params const blacklist = opendiscord.blacklist.get(data.id) @@ -923,7 +923,7 @@ const blacklistEmbeds = () => { //BLACKLIST ADD embeds.add(new api.ODEmbed("opendiscord:blacklist-add")) embeds.get("opendiscord:blacklist-add").workers.add( - new api.ODWorker("opendiscord:blacklist-add",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-add",0,async (instance,params,origin) => { const {user,data,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -937,7 +937,7 @@ const blacklistEmbeds = () => { //BLACKLIST REMOVE embeds.add(new api.ODEmbed("opendiscord:blacklist-remove")) embeds.get("opendiscord:blacklist-remove").workers.add( - new api.ODWorker("opendiscord:blacklist-remove",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-remove",0,async (instance,params,origin) => { const {user,data,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -951,7 +951,7 @@ const blacklistEmbeds = () => { //BLACKLIST DM embeds.add(new api.ODEmbed("opendiscord:blacklist-dm")) embeds.get("opendiscord:blacklist-dm").workers.add( - new api.ODWorker("opendiscord:blacklist-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-dm",0,async (instance,params,origin) => { const {user,mode,data,reason} = params const title = (mode == "add") ? lang.getTranslation("actions.titles.blacklistAddDm") : lang.getTranslation("actions.titles.blacklistRemoveDm") @@ -968,7 +968,7 @@ const blacklistEmbeds = () => { //BLACKLIST LOGS embeds.add(new api.ODEmbed("opendiscord:blacklist-logs")) embeds.get("opendiscord:blacklist-logs").workers.add( - new api.ODWorker("opendiscord:blacklist-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-logs",0,async (instance,params,origin) => { const {user,mode,data,reason} = params const title = (mode == "add") ? lang.getTranslation("actions.titles.blacklistAdd") : lang.getTranslation("actions.titles.blacklistRemove") @@ -989,7 +989,7 @@ const transcriptEmbeds = () => { //TRANSCRIPT TEXT READY embeds.add(new api.ODEmbed("opendiscord:transcript-text-ready")) embeds.get("opendiscord:transcript-text-ready").workers.add( - new api.ODWorker("opendiscord:transcript-text-ready",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-text-ready",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler} = params const transcriptConfig = opendiscord.configs.get("opendiscord:transcripts") @@ -1007,11 +1007,11 @@ const transcriptEmbeds = () => { }catch{} } - if (source == "channel") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdChannel",[lang.getTranslation("params.lowercase.text")])) - else if (source == "creator-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdCreator",[lang.getTranslation("params.lowercase.text")])) - else if (source == "participant-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdParticipant",[lang.getTranslation("params.lowercase.text")])) - else if (source == "active-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdActiveAdmin",[lang.getTranslation("params.lowercase.text")])) - else if (source == "every-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdEveryAdmin",[lang.getTranslation("params.lowercase.text")])) + if (origin == "channel") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdChannel",[lang.getTranslation("params.lowercase.text")])) + else if (origin == "creator-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdCreator",[lang.getTranslation("params.lowercase.text")])) + else if (origin == "participant-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdParticipant",[lang.getTranslation("params.lowercase.text")])) + else if (origin == "active-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdActiveAdmin",[lang.getTranslation("params.lowercase.text")])) + else if (origin == "every-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdEveryAdmin",[lang.getTranslation("params.lowercase.text")])) else instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdOther",[lang.getTranslation("params.lowercase.text")])) }) ) @@ -1019,7 +1019,7 @@ const transcriptEmbeds = () => { //TRANSCRIPT HTML READY embeds.add(new api.ODEmbed("opendiscord:transcript-html-ready")) embeds.get("opendiscord:transcript-html-ready").workers.add( - new api.ODWorker("opendiscord:transcript-html-ready",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-html-ready",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,result} = params const transcriptConfig = opendiscord.configs.get("opendiscord:transcripts") @@ -1038,11 +1038,11 @@ const transcriptEmbeds = () => { }catch{} } - if (source == "channel") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdChannel",[lang.getTranslation("params.lowercase.html")])) - else if (source == "creator-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdCreator",[lang.getTranslation("params.lowercase.html")])) - else if (source == "participant-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdParticipant",[lang.getTranslation("params.lowercase.html")])) - else if (source == "active-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdActiveAdmin",[lang.getTranslation("params.lowercase.html")])) - else if (source == "every-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdEveryAdmin",[lang.getTranslation("params.lowercase.html")])) + if (origin == "channel") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdChannel",[lang.getTranslation("params.lowercase.html")])) + else if (origin == "creator-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdCreator",[lang.getTranslation("params.lowercase.html")])) + else if (origin == "participant-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdParticipant",[lang.getTranslation("params.lowercase.html")])) + else if (origin == "active-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdActiveAdmin",[lang.getTranslation("params.lowercase.html")])) + else if (origin == "every-admin-dm") instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdEveryAdmin",[lang.getTranslation("params.lowercase.html")])) else instance.setDescription(lang.getTranslationWithParams("transcripts.success.createdOther",[lang.getTranslation("params.lowercase.html")])) }) ) @@ -1050,7 +1050,7 @@ const transcriptEmbeds = () => { //TRANSCRIPT HTML PROGRESS embeds.add(new api.ODEmbed("opendiscord:transcript-html-progress")) embeds.get("opendiscord:transcript-html-progress").workers.add( - new api.ODWorker("opendiscord:transcript-html-progress",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-html-progress",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,remaining} = params const remainingDate = new Date(new Date().getTime()+remaining) @@ -1076,7 +1076,7 @@ const transcriptEmbeds = () => { //TRANSCRIPT ERROR embeds.add(new api.ODEmbed("opendiscord:transcript-error")) embeds.get("opendiscord:transcript-error").workers.add( - new api.ODWorker("opendiscord:transcript-error",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-error",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,reason} = params instance.setColor(generalConfig.data.system.useRedErrorEmbeds ? "Red" : generalConfig.data.mainColor) @@ -1093,7 +1093,7 @@ const roleEmbeds = () => { //REACTION ROLE embeds.add(new api.ODEmbed("opendiscord:reaction-role")) embeds.get("opendiscord:reaction-role").workers.add( - new api.ODWorker("opendiscord:reaction-role",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role",0,async (instance,params,origin) => { const {guild,user,role,result} = params instance.setColor(generalConfig.data.mainColor) @@ -1117,7 +1117,7 @@ const roleEmbeds = () => { //REACTION ROLE DM embeds.add(new api.ODEmbed("opendiscord:reaction-role-dm")) embeds.get("opendiscord:reaction-role-dm").workers.add( - new api.ODWorker("opendiscord:reaction-role-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role-dm",0,async (instance,params,origin) => { const {guild,user,role,result} = params instance.setColor(generalConfig.data.mainColor) @@ -1143,7 +1143,7 @@ const roleEmbeds = () => { //REACTION ROLE LOGS embeds.add(new api.ODEmbed("opendiscord:reaction-role-logs")) embeds.get("opendiscord:reaction-role-logs").workers.add( - new api.ODWorker("opendiscord:reaction-role-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role-logs",0,async (instance,params,origin) => { const {guild,user,role,result} = params instance.setColor(generalConfig.data.mainColor) @@ -1171,7 +1171,7 @@ const clearEmbeds = () => { //CLEAR VERIFY MESSAGE embeds.add(new api.ODEmbed("opendiscord:clear-verify-message")) embeds.get("opendiscord:clear-verify-message").workers.add( - new api.ODWorker("opendiscord:clear-verify-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-verify-message",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params instance.setColor(generalConfig.data.mainColor) @@ -1189,7 +1189,7 @@ const clearEmbeds = () => { //CLEAR MESSAGE embeds.add(new api.ODEmbed("opendiscord:clear-message")) embeds.get("opendiscord:clear-message").workers.add( - new api.ODWorker("opendiscord:clear-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-message",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params instance.setColor(generalConfig.data.mainColor) @@ -1206,7 +1206,7 @@ const clearEmbeds = () => { //CLEAR LOGS embeds.add(new api.ODEmbed("opendiscord:clear-logs")) embeds.get("opendiscord:clear-logs").workers.add( - new api.ODWorker("opendiscord:clear-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-logs",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params instance.setColor(generalConfig.data.mainColor) @@ -1226,10 +1226,10 @@ const autoEmbeds = () => { //AUTOCLOSE MESSAGE embeds.add(new api.ODEmbed("opendiscord:autoclose-message")) embeds.get("opendiscord:autoclose-message").workers.add( - new api.ODWorker("opendiscord:autoclose-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-message",0,async (instance,params,origin) => { const {user,ticket} = params const hours: number = ticket.get("opendiscord:autoclose-hours").value - const description = (source == "leave") ? lang.getTranslation("actions.descriptions.autocloseLeave") : lang.getTranslationWithParams("actions.descriptions.autocloseTimeout",[hours.toString()]) + const description = (origin == "leave") ? lang.getTranslation("actions.descriptions.autocloseLeave") : lang.getTranslationWithParams("actions.descriptions.autocloseTimeout",[hours.toString()]) instance.setAuthor(user.displayName,user.displayAvatarURL()) instance.setColor(generalConfig.data.mainColor) @@ -1242,10 +1242,10 @@ const autoEmbeds = () => { //AUTODELETE MESSAGE embeds.add(new api.ODEmbed("opendiscord:autodelete-message")) embeds.get("opendiscord:autodelete-message").workers.add( - new api.ODWorker("opendiscord:autodelete-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-message",0,async (instance,params,origin) => { const {user,ticket} = params const days: number = ticket.get("opendiscord:autodelete-days").value - const description = (source == "leave") ? lang.getTranslation("actions.descriptions.autodeleteLeave") : lang.getTranslationWithParams("actions.descriptions.autodeleteTimeout",[days.toString()]) + const description = (origin == "leave") ? lang.getTranslation("actions.descriptions.autodeleteLeave") : lang.getTranslationWithParams("actions.descriptions.autodeleteTimeout",[days.toString()]) instance.setAuthor(user.displayName,user.displayAvatarURL()) instance.setColor(generalConfig.data.mainColor) @@ -1258,7 +1258,7 @@ const autoEmbeds = () => { //AUTOCLOSE ENABLE embeds.add(new api.ODEmbed("opendiscord:autoclose-enable")) embeds.get("opendiscord:autoclose-enable").workers.add( - new api.ODWorker("opendiscord:autoclose-enable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-enable",0,async (instance,params,origin) => { const {user,ticket,reason,time} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1272,7 +1272,7 @@ const autoEmbeds = () => { //AUTODELETE ENABLE embeds.add(new api.ODEmbed("opendiscord:autodelete-enable")) embeds.get("opendiscord:autodelete-enable").workers.add( - new api.ODWorker("opendiscord:autodelete-enable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-enable",0,async (instance,params,origin) => { const {user,ticket,reason,time} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1286,7 +1286,7 @@ const autoEmbeds = () => { //AUTOCLOSE DISABLE embeds.add(new api.ODEmbed("opendiscord:autoclose-disable")) embeds.get("opendiscord:autoclose-disable").workers.add( - new api.ODWorker("opendiscord:autoclose-disable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-disable",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1300,7 +1300,7 @@ const autoEmbeds = () => { //AUTODELETE DISABLE embeds.add(new api.ODEmbed("opendiscord:autodelete-disable")) embeds.get("opendiscord:autodelete-disable").workers.add( - new api.ODWorker("opendiscord:autodelete-disable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-disable",0,async (instance,params,origin) => { const {user,ticket,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1316,7 +1316,7 @@ const extraEmbeds = () => { //TOPIC SET embeds.add(new api.ODEmbed("opendiscord:topic-set")) embeds.get("opendiscord:topic-set").workers.add( - new api.ODWorker("opendiscord:topic-set",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:topic-set",0,async (instance,params,origin) => { const {user,topic} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1330,7 +1330,7 @@ const extraEmbeds = () => { //PRIORITY SET embeds.add(new api.ODEmbed("opendiscord:priority-set")) embeds.get("opendiscord:priority-set").workers.add( - new api.ODWorker("opendiscord:priority-set",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:priority-set",0,async (instance,params,origin) => { const {user,priority,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1344,7 +1344,7 @@ const extraEmbeds = () => { //PRIORITY GET embeds.add(new api.ODEmbed("opendiscord:priority-get")) embeds.get("opendiscord:priority-get").workers.add( - new api.ODWorker("opendiscord:priority-get",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:priority-get",0,async (instance,params,origin) => { const {user,priority} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) @@ -1357,7 +1357,7 @@ const extraEmbeds = () => { //TRANSFER MESSAGE embeds.add(new api.ODEmbed("opendiscord:transfer-message")) embeds.get("opendiscord:transfer-message").workers.add( - new api.ODWorker("opendiscord:transfer-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transfer-message",0,async (instance,params,origin) => { const {user,oldCreator,newCreator,reason} = params instance.setAuthor(user.displayName,user.displayAvatarURL()) diff --git a/src/builders/files.ts b/src/builders/files.ts index 76f1e67..d603598 100644 --- a/src/builders/files.ts +++ b/src/builders/files.ts @@ -17,7 +17,7 @@ const transcriptFiles = () => { //TEXT TRANSCRIPT files.add(new api.ODFile("opendiscord:text-transcript")) files.get("opendiscord:text-transcript").workers.add( - new api.ODWorker("opendiscord:text-transcript",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:text-transcript",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,result} = params const fileMode = transcriptConfig.data.textTranscriptStyle.fileMode diff --git a/src/builders/messages.ts b/src/builders/messages.ts index acc4303..32b1f34 100644 --- a/src/builders/messages.ts +++ b/src/builders/messages.ts @@ -31,7 +31,7 @@ const verifyBarMessages = () => { //VERIFYBAR TICKET MESSAGE messages.add(new api.ODMessage("opendiscord:verifybar-ticket-message")) messages.get("opendiscord:verifybar-ticket-message").workers.add( - new api.ODWorker("opendiscord:verifybar-ticket-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-ticket-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-ticket-message`") @@ -105,7 +105,7 @@ const verifyBarMessages = () => { //TICKET CLOSED messages.add(new api.ODMessage("opendiscord:verifybar-close-message")) messages.get("opendiscord:verifybar-close-message").workers.add( - new api.ODWorker("opendiscord:verifybar-close-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-close-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-close-message`") @@ -141,7 +141,7 @@ const verifyBarMessages = () => { //TICKET REOPENED messages.add(new api.ODMessage("opendiscord:verifybar-reopen-message")) messages.get("opendiscord:verifybar-reopen-message").workers.add( - new api.ODWorker("opendiscord:verifybar-reopen-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-reopen-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-reopen-message`") @@ -177,7 +177,7 @@ const verifyBarMessages = () => { //TICKET CLAIM messages.add(new api.ODMessage("opendiscord:verifybar-claim-message")) messages.get("opendiscord:verifybar-claim-message").workers.add( - new api.ODWorker("opendiscord:verifybar-claim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-claim-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-claim-message`") @@ -207,7 +207,7 @@ const verifyBarMessages = () => { //TICKET UNCLAIM messages.add(new api.ODMessage("opendiscord:verifybar-unclaim-message")) messages.get("opendiscord:verifybar-unclaim-message").workers.add( - new api.ODWorker("opendiscord:verifybar-unclaim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-unclaim-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-unclaim-message`") @@ -237,7 +237,7 @@ const verifyBarMessages = () => { //TICKET PIN messages.add(new api.ODMessage("opendiscord:verifybar-pin-message")) messages.get("opendiscord:verifybar-pin-message").workers.add( - new api.ODWorker("opendiscord:verifybar-pin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-pin-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-pin-message`") @@ -267,7 +267,7 @@ const verifyBarMessages = () => { //TICKET UNPIN messages.add(new api.ODMessage("opendiscord:verifybar-unpin-message")) messages.get("opendiscord:verifybar-unpin-message").workers.add( - new api.ODWorker("opendiscord:verifybar-unpin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-unpin-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-unpin-message`") @@ -297,7 +297,7 @@ const verifyBarMessages = () => { //TICKET AUTOCLOSED messages.add(new api.ODMessage("opendiscord:verifybar-autoclose-message")) messages.get("opendiscord:verifybar-autoclose-message").workers.add( - new api.ODWorker("opendiscord:verifybar-autoclose-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:verifybar-autoclose-message",0,async (instance,params,origin) => { const {guild,channel,user,verifybar,originalMessage} = params if (!guild || channel.isDMBased()){ instance.setContent("ODError: Not In Guild => `opendiscord:verifybar-autoclose-message`") @@ -332,9 +332,9 @@ const errorMessages = () => { //ERROR messages.add(new api.ODMessage("opendiscord:error")) messages.get("opendiscord:error").workers.add( - new api.ODWorker("opendiscord:error",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error",0,async (instance,params,origin) => { const {guild,channel,user,error,layout,customTitle} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error").build(source,{guild,channel,user,error,layout,customTitle})) + instance.addEmbed(await embeds.getSafe("opendiscord:error").build(origin,{guild,channel,user,error,layout,customTitle})) instance.setEphemeral(true) }) ) @@ -342,9 +342,9 @@ const errorMessages = () => { //ERROR OPTION MISSING messages.add(new api.ODMessage("opendiscord:error-option-missing")) messages.get("opendiscord:error-option-missing").workers.add( - new api.ODWorker("opendiscord:error-option-missing",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-option-missing",0,async (instance,params,origin) => { const {guild,channel,user,error} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-option-missing").build(source,{guild,channel,user,error})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-option-missing").build(origin,{guild,channel,user,error})) instance.setEphemeral(true) }) ) @@ -352,9 +352,9 @@ const errorMessages = () => { //ERROR OPTION INVALID messages.add(new api.ODMessage("opendiscord:error-option-invalid")) messages.get("opendiscord:error-option-invalid").workers.add( - new api.ODWorker("opendiscord:error-option-invalid",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-option-invalid",0,async (instance,params,origin) => { const {guild,channel,user,error} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-option-invalid").build(source,{guild,channel,user,error})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-option-invalid").build(origin,{guild,channel,user,error})) instance.setEphemeral(true) }) ) @@ -362,9 +362,9 @@ const errorMessages = () => { //ERROR UNKNOWN COMMAND messages.add(new api.ODMessage("opendiscord:error-unknown-command")) messages.get("opendiscord:error-unknown-command").workers.add( - new api.ODWorker("opendiscord:error-unknown-command",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-unknown-command",0,async (instance,params,origin) => { const {guild,channel,user,error} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-unknown-command").build(source,{guild,channel,user,error})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-unknown-command").build(origin,{guild,channel,user,error})) instance.setEphemeral(true) }) ) @@ -372,9 +372,9 @@ const errorMessages = () => { //ERROR NO PERMISSIONS messages.add(new api.ODMessage("opendiscord:error-no-permissions")) messages.get("opendiscord:error-no-permissions").workers.add( - new api.ODWorker("opendiscord:error-no-permissions",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions",0,async (instance,params,origin) => { const {guild,channel,user,permissions} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions})) instance.setEphemeral(true) }) ) @@ -382,9 +382,9 @@ const errorMessages = () => { //ERROR NO PERMISSIONS COOLDOWN messages.add(new api.ODMessage("opendiscord:error-no-permissions-cooldown")) messages.get("opendiscord:error-no-permissions-cooldown").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-cooldown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-cooldown",0,async (instance,params,origin) => { const {guild,channel,user,until} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-cooldown").build(source,{guild,channel,user,until})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-cooldown").build(origin,{guild,channel,user,until})) instance.setEphemeral(true) }) ) @@ -392,9 +392,9 @@ const errorMessages = () => { //ERROR NO PERMISSIONS BLACKLISTED messages.add(new api.ODMessage("opendiscord:error-no-permissions-blacklisted")) messages.get("opendiscord:error-no-permissions-blacklisted").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-blacklisted",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-blacklisted",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-blacklisted").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-blacklisted").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -402,9 +402,9 @@ const errorMessages = () => { //ERROR NO PERMISSIONS LIMITS messages.add(new api.ODMessage("opendiscord:error-no-permissions-limits")) messages.get("opendiscord:error-no-permissions-limits").workers.add( - new api.ODWorker("opendiscord:error-no-permissions-limits",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-no-permissions-limits",0,async (instance,params,origin) => { const {guild,channel,user,limit} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-limits").build(source,{guild,channel,user,limit})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-no-permissions-limits").build(origin,{guild,channel,user,limit})) instance.setEphemeral(true) }) ) @@ -412,9 +412,9 @@ const errorMessages = () => { //ERROR RESPONDER TIMEOUT messages.add(new api.ODMessage("opendiscord:error-responder-timeout")) messages.get("opendiscord:error-responder-timeout").workers.add( - new api.ODWorker("opendiscord:error-responder-timeout",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-responder-timeout",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-responder-timeout").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-responder-timeout").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -422,9 +422,9 @@ const errorMessages = () => { //ERROR TICKET UNKNOWN messages.add(new api.ODMessage("opendiscord:error-ticket-unknown")) messages.get("opendiscord:error-ticket-unknown").workers.add( - new api.ODWorker("opendiscord:error-ticket-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-unknown",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-unknown").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-unknown").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -432,10 +432,10 @@ const errorMessages = () => { //ERROR TICKET DEPRECATED messages.add(new api.ODMessage("opendiscord:error-ticket-deprecated")) messages.get("opendiscord:error-ticket-deprecated").workers.add( - new api.ODWorker("opendiscord:error-ticket-deprecated",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-deprecated",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-deprecated").build(source,{guild,channel,user})) - instance.addComponent(await buttons.getSafe("opendiscord:error-ticket-deprecated-transcript").build(source,{})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-deprecated").build(origin,{guild,channel,user})) + instance.addComponent(await buttons.getSafe("opendiscord:error-ticket-deprecated-transcript").build(origin,{})) instance.setEphemeral(true) }) ) @@ -443,9 +443,9 @@ const errorMessages = () => { //ERROR OPTION UNKNOWN messages.add(new api.ODMessage("opendiscord:error-option-unknown")) messages.get("opendiscord:error-option-unknown").workers.add( - new api.ODWorker("opendiscord:error-option-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-option-unknown",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-option-unknown").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-option-unknown").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -453,9 +453,9 @@ const errorMessages = () => { //ERROR PANEL UNKNOWN messages.add(new api.ODMessage("opendiscord:error-panel-unknown")) messages.get("opendiscord:error-panel-unknown").workers.add( - new api.ODWorker("opendiscord:error-panel-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-panel-unknown",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-panel-unknown").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-panel-unknown").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -463,9 +463,9 @@ const errorMessages = () => { //ERROR NOT IN GUILD messages.add(new api.ODMessage("opendiscord:error-not-in-guild")) messages.get("opendiscord:error-not-in-guild").workers.add( - new api.ODWorker("opendiscord:error-not-in-guild",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-not-in-guild",0,async (instance,params,origin) => { const {channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user})) instance.setEphemeral(true) }) ) @@ -473,9 +473,9 @@ const errorMessages = () => { //ERROR CHANNEL RENAME messages.add(new api.ODMessage("opendiscord:error-channel-rename")) messages.get("opendiscord:error-channel-rename").workers.add( - new api.ODWorker("opendiscord:error-channel-rename",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-channel-rename",0,async (instance,params,origin) => { const {guild,channel,user,originalName,newName} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-channel-rename").build(source,{guild,channel,user,originalName,newName})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-channel-rename").build(origin,{guild,channel,user,originalName,newName})) instance.setEphemeral(true) }) ) @@ -483,9 +483,9 @@ const errorMessages = () => { //ERROR TICKET BUSY messages.add(new api.ODMessage("opendiscord:error-ticket-busy")) messages.get("opendiscord:error-ticket-busy").workers.add( - new api.ODWorker("opendiscord:error-ticket-busy",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:error-ticket-busy",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-busy").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:error-ticket-busy").build(origin,{guild,channel,user})) instance.setEphemeral(true) }) ) @@ -495,20 +495,20 @@ const helpMenuMessages = () => { //HELP MENU messages.add(new api.ODMessage("opendiscord:help-menu")) messages.get("opendiscord:help-menu").workers.add( - new api.ODWorker("opendiscord:help-menu",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:help-menu",0,async (instance,params,origin) => { const {mode,page} = params const totalPages = (await opendiscord.helpmenu.render(mode)).length - const embed = await embeds.getSafe("opendiscord:help-menu").build(source,{mode,page}) + const embed = await embeds.getSafe("opendiscord:help-menu").build(origin,{mode,page}) instance.addEmbed(embed) if (totalPages > 1){ //when more than 1 page - instance.addComponent(await buttons.getSafe("opendiscord:help-menu-previous").build(source,{mode,page})) - instance.addComponent(await buttons.getSafe("opendiscord:help-menu-page").build(source,{mode,page})) - instance.addComponent(await buttons.getSafe("opendiscord:help-menu-next").build(source,{mode,page})) + instance.addComponent(await buttons.getSafe("opendiscord:help-menu-previous").build(origin,{mode,page})) + instance.addComponent(await buttons.getSafe("opendiscord:help-menu-page").build(origin,{mode,page})) + instance.addComponent(await buttons.getSafe("opendiscord:help-menu-next").build(origin,{mode,page})) instance.addComponent(buttons.getNewLine("opendiscord:help-menu-divider")) } - if (generalConfig.data.textCommands && generalConfig.data.slashCommands) instance.addComponent(await buttons.get("opendiscord:help-menu-switch").build(source,{mode,page})) + if (generalConfig.data.textCommands && generalConfig.data.slashCommands) instance.addComponent(await buttons.get("opendiscord:help-menu-switch").build(origin,{mode,page})) }) ) } @@ -517,45 +517,45 @@ const statsMessages = () => { //STATS GLOBAL messages.add(new api.ODMessage("opendiscord:stats-global")) messages.get("opendiscord:stats-global").workers.add( - new api.ODWorker("opendiscord:stats-global",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:stats-global",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:stats-global").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:stats-global").build(origin,{guild,channel,user})) }) ) //STATS TICKET messages.add(new api.ODMessage("opendiscord:stats-ticket")) messages.get("opendiscord:stats-ticket").workers.add( - new api.ODWorker("opendiscord:stats-ticket",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:stats-ticket",0,async (instance,params,origin) => { const {guild,channel,user,scopeData} = params - instance.addEmbed(await embeds.getSafe("opendiscord:stats-ticket").build(source,{guild,channel,user,scopeData})) + instance.addEmbed(await embeds.getSafe("opendiscord:stats-ticket").build(origin,{guild,channel,user,scopeData})) }) ) //STATS USER messages.add(new api.ODMessage("opendiscord:stats-user")) messages.get("opendiscord:stats-user").workers.add( - new api.ODWorker("opendiscord:stats-user",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:stats-user",0,async (instance,params,origin) => { const {guild,channel,user,scopeData} = params - instance.addEmbed(await embeds.getSafe("opendiscord:stats-user").build(source,{guild,channel,user,scopeData})) + instance.addEmbed(await embeds.getSafe("opendiscord:stats-user").build(origin,{guild,channel,user,scopeData})) }) ) //STATS RESET messages.add(new api.ODMessage("opendiscord:stats-reset")) messages.get("opendiscord:stats-reset").workers.add( - new api.ODWorker("opendiscord:stats-reset",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:stats-reset",0,async (instance,params,origin) => { const {guild,channel,user,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:stats-reset").build(source,{guild,channel,user,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:stats-reset").build(origin,{guild,channel,user,reason})) }) ) //STATS TICKET UNKNOWN messages.add(new api.ODMessage("opendiscord:stats-ticket-unknown")) messages.get("opendiscord:stats-ticket-unknown").workers.add( - new api.ODWorker("opendiscord:stats-ticket-unknown",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:stats-ticket-unknown",0,async (instance,params,origin) => { const {guild,channel,user,id} = params - instance.addEmbed(await embeds.getSafe("opendiscord:stats-ticket-unknown").build(source,{guild,channel,user,id})) + instance.addEmbed(await embeds.getSafe("opendiscord:stats-ticket-unknown").build(origin,{guild,channel,user,id})) instance.setEphemeral(true) }) ) @@ -565,7 +565,7 @@ const panelMessages = () => { //PANEL messages.add(new api.ODMessage("opendiscord:panel")) messages.get("opendiscord:panel").workers.add([ - new api.ODWorker("opendiscord:panel-layout",1,async (instance,params,source) => { + new api.ODWorker("opendiscord:panel-layout",1,async (instance,params,origin) => { const {guild,channel,user,panel} = params //add text @@ -584,9 +584,9 @@ const panelMessages = () => { //add embed const embedOptions = panel.get("opendiscord:embed").value - if (embedOptions.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:panel").build(source,{guild,channel,user,panel})) + if (embedOptions.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:panel").build(origin,{guild,channel,user,panel})) }), - new api.ODWorker("opendiscord:panel-components",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:panel-components",0,async (instance,params,origin) => { const {guild,channel,user,panel} = params const options: api.ODOption[] = [] panel.get("opendiscord:options").value.forEach((id) => { @@ -600,13 +600,13 @@ const panelMessages = () => { options.forEach((option) => { if (option instanceof api.ODTicketOption) ticketOptions.push(option) }) - instance.addComponent(await dropdowns.getSafe("opendiscord:panel-dropdown-tickets").build(source,{guild,channel,user,panel,options:ticketOptions})) + instance.addComponent(await dropdowns.getSafe("opendiscord:panel-dropdown-tickets").build(origin,{guild,channel,user,panel,options:ticketOptions})) }else{ //buttons for (const option of options){ - if (option instanceof api.ODTicketOption) instance.addComponent(await buttons.getSafe("opendiscord:ticket-option").build(source,{guild,channel,user,panel,option})) - else if (option instanceof api.ODWebsiteOption) instance.addComponent(await buttons.getSafe("opendiscord:website-option").build(source,{guild,channel,user,panel,option})) - else if (option instanceof api.ODRoleOption) instance.addComponent(await buttons.getSafe("opendiscord:role-option").build(source,{guild,channel,user,panel,option})) + if (option instanceof api.ODTicketOption) instance.addComponent(await buttons.getSafe("opendiscord:ticket-option").build(origin,{guild,channel,user,panel,option})) + else if (option instanceof api.ODWebsiteOption) instance.addComponent(await buttons.getSafe("opendiscord:website-option").build(origin,{guild,channel,user,panel,option})) + else if (option instanceof api.ODRoleOption) instance.addComponent(await buttons.getSafe("opendiscord:role-option").build(origin,{guild,channel,user,panel,option})) } } }) @@ -615,7 +615,7 @@ const panelMessages = () => { //PANEL READY messages.add(new api.ODMessage("opendiscord:panel-ready")) messages.get("opendiscord:panel-ready").workers.add( - new api.ODWorker("opendiscord:panel-ready",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:panel-ready",0,async (instance,params,origin) => { instance.setContent("## "+lang.getTranslation("actions.descriptions.panelReady")) instance.setEphemeral(true) }) @@ -626,10 +626,10 @@ const ticketMessages = () => { //TICKET CREATED messages.add(new api.ODMessage("opendiscord:ticket-created")) messages.get("opendiscord:ticket-created").workers.add( - new api.ODWorker("opendiscord:ticket-created",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params - instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created").build(source,{guild,channel,user,ticket})) + instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created").build(origin,{guild,channel,user,ticket})) instance.addComponent(await buttons.getSafe("opendiscord:visit-ticket").build("ticket-created",{guild,channel,user,ticket})) instance.setEphemeral(true) }) @@ -638,7 +638,7 @@ const ticketMessages = () => { //TICKET CREATED DM messages.add(new api.ODMessage("opendiscord:ticket-created-dm")) messages.get("opendiscord:ticket-created-dm").workers.add( - new api.ODWorker("opendiscord:ticket-created-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created-dm",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params //add text @@ -646,7 +646,7 @@ const ticketMessages = () => { if (text !== "") instance.setContent(text) //add embed - if (ticket.option.get("opendiscord:dm-message-embed").value.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created-dm").build(source,{guild,channel,user,ticket})) + if (ticket.option.get("opendiscord:dm-message-embed").value.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created-dm").build(origin,{guild,channel,user,ticket})) //add components instance.addComponent(await buttons.getSafe("opendiscord:visit-ticket").build("ticket-created",{guild,channel,user,ticket})) @@ -656,10 +656,10 @@ const ticketMessages = () => { //TICKET CREATED LOGS messages.add(new api.ODMessage("opendiscord:ticket-created-logs")) messages.get("opendiscord:ticket-created-logs").workers.add( - new api.ODWorker("opendiscord:ticket-created-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-created-logs",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params - instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created-logs").build(source,{guild,channel,user,ticket})) + instance.addEmbed(await embeds.getSafe("opendiscord:ticket-created-logs").build(origin,{guild,channel,user,ticket})) instance.addComponent(await buttons.getSafe("opendiscord:visit-ticket").build("ticket-created",{guild,channel,user,ticket})) }) ) @@ -667,7 +667,7 @@ const ticketMessages = () => { //TICKET MESSAGE messages.add(new api.ODMessage("opendiscord:ticket-message")) messages.get("opendiscord:ticket-message").workers.add([ - new api.ODWorker("opendiscord:ticket-message-layout",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-message-layout",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params //add pings @@ -686,9 +686,9 @@ const ticketMessages = () => { else instance.setContent(pingText) //add embed - if (ticket.option.get("opendiscord:ticket-message-embed").value.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:ticket-message").build(source,{guild,channel,user,ticket})) + if (ticket.option.get("opendiscord:ticket-message-embed").value.enabled) instance.addEmbed(await embeds.getSafe("opendiscord:ticket-message").build(origin,{guild,channel,user,ticket})) }), - new api.ODWorker("opendiscord:ticket-message-components",1,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-message-components",1,async (instance,params,origin) => { const {guild,channel,user,ticket} = params //add components if (generalConfig.data.system.enableTicketClaimButtons && !ticket.get("opendiscord:closed").value){ @@ -718,7 +718,7 @@ const ticketMessages = () => { //enable ticket deletion if (generalConfig.data.system.enableTicketDeleteButtons) instance.addComponent(await buttons.getSafe("opendiscord:delete-ticket").build("ticket-message",{guild,channel,user,ticket})) }), - new api.ODWorker("opendiscord:ticket-message-disable-components",2,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-message-disable-components",2,async (instance,params,origin) => { const {ticket} = params if (ticket.get("opendiscord:for-deletion").value){ //disable all buttons when ticket is being prepared for deletion @@ -734,9 +734,9 @@ const ticketMessages = () => { //TICKET CLOSED messages.add(new api.ODMessage("opendiscord:close-message")) messages.get("opendiscord:close-message").workers.add( - new api.ODWorker("opendiscord:close-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:close-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:close-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:close-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketCloseButtons) instance.addComponent(await buttons.getSafe("opendiscord:reopen-ticket").build("close-message",{guild,channel,user,ticket})) if (generalConfig.data.system.enableTicketDeleteButtons) instance.addComponent(await buttons.getSafe("opendiscord:delete-ticket").build("close-message",{guild,channel,user,ticket})) }) @@ -745,9 +745,9 @@ const ticketMessages = () => { //TICKET REOPENED messages.add(new api.ODMessage("opendiscord:reopen-message")) messages.get("opendiscord:reopen-message").workers.add( - new api.ODWorker("opendiscord:reopen-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reopen-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:reopen-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:reopen-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketCloseButtons) instance.addComponent(await buttons.getSafe("opendiscord:close-ticket").build("reopen-message",{guild,channel,user,ticket})) if (generalConfig.data.system.enableTicketDeleteButtons) instance.addComponent(await buttons.getSafe("opendiscord:delete-ticket").build("reopen-message",{guild,channel,user,ticket})) }) @@ -756,18 +756,18 @@ const ticketMessages = () => { //TICKET DELETED messages.add(new api.ODMessage("opendiscord:delete-message")) messages.get("opendiscord:delete-message").workers.add( - new api.ODWorker("opendiscord:delete-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:delete-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:delete-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:delete-message").build(origin,{guild,channel,user,ticket,reason})) }) ) //TICKET CLAIMED messages.add(new api.ODMessage("opendiscord:claim-message")) messages.get("opendiscord:claim-message").workers.add( - new api.ODWorker("opendiscord:claim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:claim-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:claim-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:claim-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketClaimButtons) instance.addComponent(await buttons.getSafe("opendiscord:unclaim-ticket").build("claim-message",{guild,channel,user,ticket})) }) ) @@ -775,9 +775,9 @@ const ticketMessages = () => { //TICKET UNCLAIMED messages.add(new api.ODMessage("opendiscord:unclaim-message")) messages.get("opendiscord:unclaim-message").workers.add( - new api.ODWorker("opendiscord:unclaim-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unclaim-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:unclaim-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:unclaim-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketClaimButtons) instance.addComponent(await buttons.getSafe("opendiscord:claim-ticket").build("unclaim-message",{guild,channel,user,ticket})) }) ) @@ -785,9 +785,9 @@ const ticketMessages = () => { //TICKET PINNED messages.add(new api.ODMessage("opendiscord:pin-message")) messages.get("opendiscord:pin-message").workers.add( - new api.ODWorker("opendiscord:pin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:pin-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:pin-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:pin-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketPinButtons) instance.addComponent(await buttons.getSafe("opendiscord:unpin-ticket").build("pin-message",{guild,channel,user,ticket})) }) ) @@ -795,9 +795,9 @@ const ticketMessages = () => { //TICKET UNPINNED messages.add(new api.ODMessage("opendiscord:unpin-message")) messages.get("opendiscord:unpin-message").workers.add( - new api.ODWorker("opendiscord:unpin-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unpin-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:unpin-message").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:unpin-message").build(origin,{guild,channel,user,ticket,reason})) if (generalConfig.data.system.enableTicketPinButtons) instance.addComponent(await buttons.getSafe("opendiscord:pin-ticket").build("unpin-message",{guild,channel,user,ticket})) }) ) @@ -805,54 +805,54 @@ const ticketMessages = () => { //TICKET RENAMED messages.add(new api.ODMessage("opendiscord:rename-message")) messages.get("opendiscord:rename-message").workers.add( - new api.ODWorker("opendiscord:rename-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:rename-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,data} = params - instance.addEmbed(await embeds.getSafe("opendiscord:rename-message").build(source,{guild,channel,user,ticket,reason,data})) + instance.addEmbed(await embeds.getSafe("opendiscord:rename-message").build(origin,{guild,channel,user,ticket,reason,data})) }) ) //TICKET MOVED messages.add(new api.ODMessage("opendiscord:move-message")) messages.get("opendiscord:move-message").workers.add( - new api.ODWorker("opendiscord:move-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:move-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,data} = params - instance.addEmbed(await embeds.getSafe("opendiscord:move-message").build(source,{guild,channel,user,ticket,reason,data})) + instance.addEmbed(await embeds.getSafe("opendiscord:move-message").build(origin,{guild,channel,user,ticket,reason,data})) }) ) //TICKET USER ADDED messages.add(new api.ODMessage("opendiscord:add-message")) messages.get("opendiscord:add-message").workers.add( - new api.ODWorker("opendiscord:add-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:add-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,data} = params - instance.addEmbed(await embeds.getSafe("opendiscord:add-message").build(source,{guild,channel,user,ticket,reason,data})) + instance.addEmbed(await embeds.getSafe("opendiscord:add-message").build(origin,{guild,channel,user,ticket,reason,data})) }) ) //TICKET USER REMOVED messages.add(new api.ODMessage("opendiscord:remove-message")) messages.get("opendiscord:remove-message").workers.add( - new api.ODWorker("opendiscord:remove-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:remove-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,data} = params - instance.addEmbed(await embeds.getSafe("opendiscord:remove-message").build(source,{guild,channel,user,ticket,reason,data})) + instance.addEmbed(await embeds.getSafe("opendiscord:remove-message").build(origin,{guild,channel,user,ticket,reason,data})) }) ) //TICKET ACTION DM messages.add(new api.ODMessage("opendiscord:ticket-action-dm")) messages.get("opendiscord:ticket-action-dm").workers.add( - new api.ODWorker("opendiscord:ticket-action-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-action-dm",0,async (instance,params,origin) => { const {guild,channel,user,mode,ticket,reason,additionalData} = params - instance.addEmbed(await embeds.getSafe("opendiscord:ticket-action-dm").build(source,{guild,channel,user,mode,ticket,reason,additionalData})) + instance.addEmbed(await embeds.getSafe("opendiscord:ticket-action-dm").build(origin,{guild,channel,user,mode,ticket,reason,additionalData})) }) ) //TICKET ACTION LOGS messages.add(new api.ODMessage("opendiscord:ticket-action-logs")) messages.get("opendiscord:ticket-action-logs").workers.add( - new api.ODWorker("opendiscord:ticket-action-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-action-logs",0,async (instance,params,origin) => { const {guild,channel,user,mode,ticket,reason,additionalData} = params - instance.addEmbed(await embeds.getSafe("opendiscord:ticket-action-logs").build(source,{guild,channel,user,mode,ticket,reason,additionalData})) + instance.addEmbed(await embeds.getSafe("opendiscord:ticket-action-logs").build(origin,{guild,channel,user,mode,ticket,reason,additionalData})) }) ) } @@ -861,54 +861,54 @@ const blacklistMessages = () => { //BLACKLIST VIEW messages.add(new api.ODMessage("opendiscord:blacklist-view")) messages.get("opendiscord:blacklist-view").workers.add( - new api.ODWorker("opendiscord:blacklist-view",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-view",0,async (instance,params,origin) => { const {guild,channel,user} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-view").build(source,{guild,channel,user})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-view").build(origin,{guild,channel,user})) }) ) //BLACKLIST GET messages.add(new api.ODMessage("opendiscord:blacklist-get")) messages.get("opendiscord:blacklist-get").workers.add( - new api.ODWorker("opendiscord:blacklist-get",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-get",0,async (instance,params,origin) => { const {guild,channel,user,data} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-get").build(source,{guild,channel,user,data})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-get").build(origin,{guild,channel,user,data})) }) ) //BLACKLIST ADD messages.add(new api.ODMessage("opendiscord:blacklist-add")) messages.get("opendiscord:blacklist-add").workers.add( - new api.ODWorker("opendiscord:blacklist-add",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-add",0,async (instance,params,origin) => { const {guild,channel,user,data,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-add").build(source,{guild,channel,user,data,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-add").build(origin,{guild,channel,user,data,reason})) }) ) //BLACKLIST REMOVE messages.add(new api.ODMessage("opendiscord:blacklist-remove")) messages.get("opendiscord:blacklist-remove").workers.add( - new api.ODWorker("opendiscord:blacklist-remove",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-remove",0,async (instance,params,origin) => { const {guild,channel,user,data,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-remove").build(source,{guild,channel,user,data,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-remove").build(origin,{guild,channel,user,data,reason})) }) ) //BLACKLIST DM messages.add(new api.ODMessage("opendiscord:blacklist-dm")) messages.get("opendiscord:blacklist-dm").workers.add( - new api.ODWorker("opendiscord:blacklist-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-dm",0,async (instance,params,origin) => { const {guild,channel,user,mode,data,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-dm").build(source,{guild,channel,user,mode,data,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-dm").build(origin,{guild,channel,user,mode,data,reason})) }) ) //BLACKLIST LOGS messages.add(new api.ODMessage("opendiscord:blacklist-logs")) messages.get("opendiscord:blacklist-logs").workers.add( - new api.ODWorker("opendiscord:blacklist-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:blacklist-logs",0,async (instance,params,origin) => { const {guild,channel,user,mode,data,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-logs").build(source,{guild,channel,user,mode,data,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:blacklist-logs").build(origin,{guild,channel,user,mode,data,reason})) }) ) } @@ -917,40 +917,40 @@ const transcriptMessages = () => { //TRANSCRIPT TEXT READY messages.add(new api.ODMessage("opendiscord:transcript-text-ready")) messages.get("opendiscord:transcript-text-ready").workers.add( - new api.ODWorker("opendiscord:transcript-text-ready",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-text-ready",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,result} = params - instance.addEmbed(await embeds.getSafe("opendiscord:transcript-text-ready").build(source,{guild,channel,user,ticket,compiler,result})) - instance.addFile(await files.getSafe("opendiscord:text-transcript").build(source,{guild,channel,user,ticket,compiler,result})) + instance.addEmbed(await embeds.getSafe("opendiscord:transcript-text-ready").build(origin,{guild,channel,user,ticket,compiler,result})) + instance.addFile(await files.getSafe("opendiscord:text-transcript").build(origin,{guild,channel,user,ticket,compiler,result})) }) ) //TRANSCRIPT HTML READY messages.add(new api.ODMessage("opendiscord:transcript-html-ready")) messages.get("opendiscord:transcript-html-ready").workers.add( - new api.ODWorker("opendiscord:transcript-html-ready",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-html-ready",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,result} = params - instance.addEmbed(await embeds.getSafe("opendiscord:transcript-html-ready").build(source,{guild,channel,user,ticket,compiler,result})) - instance.addComponent(await buttons.getSafe("opendiscord:transcript-html-visit").build(source,{guild,channel,user,ticket,compiler,result})) + instance.addEmbed(await embeds.getSafe("opendiscord:transcript-html-ready").build(origin,{guild,channel,user,ticket,compiler,result})) + instance.addComponent(await buttons.getSafe("opendiscord:transcript-html-visit").build(origin,{guild,channel,user,ticket,compiler,result})) }) ) //TRANSCRIPT HTML PROGRESS messages.add(new api.ODMessage("opendiscord:transcript-html-progress")) messages.get("opendiscord:transcript-html-progress").workers.add( - new api.ODWorker("opendiscord:transcript-html-progress",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-html-progress",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,remaining} = params - instance.addEmbed(await embeds.getSafe("opendiscord:transcript-html-progress").build(source,{guild,channel,user,ticket,compiler,remaining})) + instance.addEmbed(await embeds.getSafe("opendiscord:transcript-html-progress").build(origin,{guild,channel,user,ticket,compiler,remaining})) }) ) //TRANSCRIPT ERROR messages.add(new api.ODMessage("opendiscord:transcript-error")) messages.get("opendiscord:transcript-error").workers.add( - new api.ODWorker("opendiscord:transcript-error",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transcript-error",0,async (instance,params,origin) => { const {guild,channel,user,ticket,compiler,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:transcript-error").build(source,{guild,channel,user,ticket,compiler,reason})) - instance.addComponent(await buttons.getSafe("opendiscord:transcript-error-retry").build(source,{guild,channel,user,ticket,compiler,reason})) - instance.addComponent(await buttons.getSafe("opendiscord:transcript-error-continue").build(source,{guild,channel,user,ticket,compiler,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:transcript-error").build(origin,{guild,channel,user,ticket,compiler,reason})) + instance.addComponent(await buttons.getSafe("opendiscord:transcript-error-retry").build(origin,{guild,channel,user,ticket,compiler,reason})) + instance.addComponent(await buttons.getSafe("opendiscord:transcript-error-continue").build(origin,{guild,channel,user,ticket,compiler,reason})) }) ) } @@ -959,9 +959,9 @@ const roleMessages = () => { //REACTION ROLE messages.add(new api.ODMessage("opendiscord:reaction-role")) messages.get("opendiscord:reaction-role").workers.add( - new api.ODWorker("opendiscord:reaction-role",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role",0,async (instance,params,origin) => { const {guild,user,role,result} = params - instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role").build(source,{guild,user,role,result})) + instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role").build(origin,{guild,user,role,result})) instance.setEphemeral(true) }) ) @@ -969,18 +969,18 @@ const roleMessages = () => { //REACTION ROLE DM messages.add(new api.ODMessage("opendiscord:reaction-role-dm")) messages.get("opendiscord:reaction-role-dm").workers.add( - new api.ODWorker("opendiscord:reaction-role-dm",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role-dm",0,async (instance,params,origin) => { const {guild,user,role,result} = params - instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role-dm").build(source,{guild,user,role,result})) + instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role-dm").build(origin,{guild,user,role,result})) }) ) //REACTION ROLE LOGS messages.add(new api.ODMessage("opendiscord:reaction-role-logs")) messages.get("opendiscord:reaction-role-logs").workers.add( - new api.ODWorker("opendiscord:reaction-role-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reaction-role-logs",0,async (instance,params,origin) => { const {guild,user,role,result} = params - instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role-logs").build(source,{guild,user,role,result})) + instance.addEmbed(await embeds.getSafe("opendiscord:reaction-role-logs").build(origin,{guild,user,role,result})) }) ) } @@ -989,10 +989,10 @@ const clearMessages = () => { //CLEAR VERIFY MESSAGE messages.add(new api.ODMessage("opendiscord:clear-verify-message")) messages.get("opendiscord:clear-verify-message").workers.add( - new api.ODWorker("opendiscord:clear-verify-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-verify-message",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params - instance.addEmbed(await embeds.getSafe("opendiscord:clear-verify-message").build(source,{guild,channel,user,filter,list})) - instance.addComponent(await buttons.getSafe("opendiscord:clear-continue").build(source,{guild,channel,user,filter,list})) + instance.addEmbed(await embeds.getSafe("opendiscord:clear-verify-message").build(origin,{guild,channel,user,filter,list})) + instance.addComponent(await buttons.getSafe("opendiscord:clear-continue").build(origin,{guild,channel,user,filter,list})) instance.setEphemeral(true) }) ) @@ -1000,9 +1000,9 @@ const clearMessages = () => { //CLEAR MESSAGE messages.add(new api.ODMessage("opendiscord:clear-message")) messages.get("opendiscord:clear-message").workers.add( - new api.ODWorker("opendiscord:clear-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-message",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params - instance.addEmbed(await embeds.getSafe("opendiscord:clear-message").build(source,{guild,channel,user,filter,list})) + instance.addEmbed(await embeds.getSafe("opendiscord:clear-message").build(origin,{guild,channel,user,filter,list})) instance.setEphemeral(true) }) ) @@ -1010,9 +1010,9 @@ const clearMessages = () => { //CLEAR LOGS messages.add(new api.ODMessage("opendiscord:clear-logs")) messages.get("opendiscord:clear-logs").workers.add( - new api.ODWorker("opendiscord:clear-logs",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:clear-logs",0,async (instance,params,origin) => { const {guild,channel,user,filter,list} = params - instance.addEmbed(await embeds.getSafe("opendiscord:clear-logs").build(source,{guild,channel,user,filter,list})) + instance.addEmbed(await embeds.getSafe("opendiscord:clear-logs").build(origin,{guild,channel,user,filter,list})) }) ) } @@ -1021,9 +1021,9 @@ const autoMessages = () => { //AUTOCLOSE MESSAGE messages.add(new api.ODMessage("opendiscord:autoclose-message")) messages.get("opendiscord:autoclose-message").workers.add( - new api.ODWorker("opendiscord:autoclose-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-message").build(source,{guild,channel,user,ticket})) + instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-message").build(origin,{guild,channel,user,ticket})) if (generalConfig.data.system.enableTicketCloseButtons) instance.addComponent(await buttons.getSafe("opendiscord:reopen-ticket").build("autoclose-message",{guild,channel,user,ticket})) if (generalConfig.data.system.enableTicketDeleteButtons) instance.addComponent(await buttons.getSafe("opendiscord:delete-ticket").build("autoclose-message",{guild,channel,user,ticket})) }) @@ -1032,45 +1032,45 @@ const autoMessages = () => { //AUTODELETE MESSAGE messages.add(new api.ODMessage("opendiscord:autodelete-message")) messages.get("opendiscord:autodelete-message").workers.add( - new api.ODWorker("opendiscord:autodelete-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-message").build(source,{guild,channel,user,ticket})) + instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-message").build(origin,{guild,channel,user,ticket})) }) ) //AUTOCLOSE ENABLE messages.add(new api.ODMessage("opendiscord:autoclose-enable")) messages.get("opendiscord:autoclose-enable").workers.add( - new api.ODWorker("opendiscord:autoclose-enable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-enable",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,time} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-enable").build(source,{guild,channel,user,ticket,reason,time})) + instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-enable").build(origin,{guild,channel,user,ticket,reason,time})) }) ) //AUTODELETE ENABLE messages.add(new api.ODMessage("opendiscord:autodelete-enable")) messages.get("opendiscord:autodelete-enable").workers.add( - new api.ODWorker("opendiscord:autodelete-enable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-enable",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason,time} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-enable").build(source,{guild,channel,user,ticket,reason,time})) + instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-enable").build(origin,{guild,channel,user,ticket,reason,time})) }) ) //AUTOCLOSE DISABLE messages.add(new api.ODMessage("opendiscord:autoclose-disable")) messages.get("opendiscord:autoclose-disable").workers.add( - new api.ODWorker("opendiscord:autoclose-disable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autoclose-disable",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-disable").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:autoclose-disable").build(origin,{guild,channel,user,ticket,reason})) }) ) //AUTODELETE DISABLE messages.add(new api.ODMessage("opendiscord:autodelete-disable")) messages.get("opendiscord:autodelete-disable").workers.add( - new api.ODWorker("opendiscord:autodelete-disable",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:autodelete-disable",0,async (instance,params,origin) => { const {guild,channel,user,ticket,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-disable").build(source,{guild,channel,user,ticket,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:autodelete-disable").build(origin,{guild,channel,user,ticket,reason})) }) ) } @@ -1079,36 +1079,36 @@ const extraMessages = () => { //TOPIC SET messages.add(new api.ODMessage("opendiscord:topic-set")) messages.get("opendiscord:topic-set").workers.add( - new api.ODWorker("opendiscord:topic-set",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:topic-set",0,async (instance,params,origin) => { const {guild,channel,user,ticket,topic} = params - instance.addEmbed(await embeds.getSafe("opendiscord:topic-set").build(source,{guild,channel,user,ticket,topic})) + instance.addEmbed(await embeds.getSafe("opendiscord:topic-set").build(origin,{guild,channel,user,ticket,topic})) }) ) //PRIORITY SET messages.add(new api.ODMessage("opendiscord:priority-set")) messages.get("opendiscord:priority-set").workers.add( - new api.ODWorker("opendiscord:priority-set",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:priority-set",0,async (instance,params,origin) => { const {guild,channel,user,ticket,priority,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:priority-set").build(source,{guild,channel,user,ticket,priority,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:priority-set").build(origin,{guild,channel,user,ticket,priority,reason})) }) ) //PRIORITY GET messages.add(new api.ODMessage("opendiscord:priority-get")) messages.get("opendiscord:priority-get").workers.add( - new api.ODWorker("opendiscord:priority-get",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:priority-get",0,async (instance,params,origin) => { const {guild,channel,user,ticket,priority} = params - instance.addEmbed(await embeds.getSafe("opendiscord:priority-get").build(source,{guild,channel,user,ticket,priority})) + instance.addEmbed(await embeds.getSafe("opendiscord:priority-get").build(origin,{guild,channel,user,ticket,priority})) }) ) //TRANSFER MESSAGE messages.add(new api.ODMessage("opendiscord:transfer-message")) messages.get("opendiscord:transfer-message").workers.add( - new api.ODWorker("opendiscord:transfer-message",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:transfer-message",0,async (instance,params,origin) => { const {guild,channel,user,ticket,oldCreator,newCreator,reason} = params - instance.addEmbed(await embeds.getSafe("opendiscord:transfer-message").build(source,{guild,channel,user,ticket,oldCreator,newCreator,reason})) + instance.addEmbed(await embeds.getSafe("opendiscord:transfer-message").build(origin,{guild,channel,user,ticket,oldCreator,newCreator,reason})) }) ) } \ No newline at end of file diff --git a/src/builders/modals.ts b/src/builders/modals.ts index bcf5817..7993ce7 100644 --- a/src/builders/modals.ts +++ b/src/builders/modals.ts @@ -14,10 +14,10 @@ const ticketModals = () => { //TICKET QUESTIONS modals.add(new api.ODModal("opendiscord:ticket-questions")) modals.get("opendiscord:ticket-questions").workers.add( - new api.ODWorker("opendiscord:ticket-questions",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:ticket-questions",0,async (instance,params,origin) => { const {option} = params - instance.setCustomId("od:ticket-questions_"+option.id.value+"_"+source) + instance.setCustomId("od:ticket-questions_"+option.id.value+"_"+origin) instance.setTitle(option.exists("opendiscord:name") ? option.get("opendiscord:name").value : option.id.value) const questionIds = option.get("opendiscord:questions").value questionIds.forEach((id) => { @@ -48,10 +48,10 @@ const ticketModals = () => { //CLOSE TICKET REASON modals.add(new api.ODModal("opendiscord:close-ticket-reason")) modals.get("opendiscord:close-ticket-reason").workers.add( - new api.ODWorker("opendiscord:close-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:close-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:close-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:close-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.close")) instance.addQuestion({ customId:"reason", @@ -66,10 +66,10 @@ const ticketModals = () => { //REOPEN TICKET REASON modals.add(new api.ODModal("opendiscord:reopen-ticket-reason")) modals.get("opendiscord:reopen-ticket-reason").workers.add( - new api.ODWorker("opendiscord:reopen-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:reopen-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:reopen-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:reopen-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.reopen")) instance.addQuestion({ customId:"reason", @@ -84,10 +84,10 @@ const ticketModals = () => { //DELETE TICKET REASON modals.add(new api.ODModal("opendiscord:delete-ticket-reason")) modals.get("opendiscord:delete-ticket-reason").workers.add( - new api.ODWorker("opendiscord:delete-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:delete-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:delete-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:delete-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.delete")) instance.addQuestion({ customId:"reason", @@ -102,10 +102,10 @@ const ticketModals = () => { //CLAIM TICKET REASON modals.add(new api.ODModal("opendiscord:claim-ticket-reason")) modals.get("opendiscord:claim-ticket-reason").workers.add( - new api.ODWorker("opendiscord:claim-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:claim-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:claim-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:claim-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.claim")) instance.addQuestion({ customId:"reason", @@ -120,10 +120,10 @@ const ticketModals = () => { //UNCLAIM TICKET REASON modals.add(new api.ODModal("opendiscord:unclaim-ticket-reason")) modals.get("opendiscord:unclaim-ticket-reason").workers.add( - new api.ODWorker("opendiscord:unclaim-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unclaim-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:unclaim-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:unclaim-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.unclaim")) instance.addQuestion({ customId:"reason", @@ -138,10 +138,10 @@ const ticketModals = () => { //PIN TICKET REASON modals.add(new api.ODModal("opendiscord:pin-ticket-reason")) modals.get("opendiscord:pin-ticket-reason").workers.add( - new api.ODWorker("opendiscord:pin-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:pin-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:pin-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:pin-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.pin")) instance.addQuestion({ customId:"reason", @@ -156,10 +156,10 @@ const ticketModals = () => { //UNPIN TICKET REASON modals.add(new api.ODModal("opendiscord:unpin-ticket-reason")) modals.get("opendiscord:unpin-ticket-reason").workers.add( - new api.ODWorker("opendiscord:unpin-ticket-reason",0,async (instance,params,source) => { + new api.ODWorker("opendiscord:unpin-ticket-reason",0,async (instance,params,origin) => { const {ticket} = params - instance.setCustomId("od:unpin-ticket-reason_"+ticket.id.value+"_"+source) + instance.setCustomId("od:unpin-ticket-reason_"+ticket.id.value+"_"+origin) instance.setTitle(lang.getTranslation("actions.buttons.unpin")) instance.addQuestion({ customId:"reason", diff --git a/src/commands/add.ts b/src/commands/add.ts index 502ce17..6691505 100644 --- a/src/commands/add.ts +++ b/src/commands/add.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //ADD COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:add",generalConfig.data.prefix,"add")) opendiscord.responders.commands.get("opendiscord:add").workers.add([ - new api.ODWorker("opendiscord:add",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:add",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.add,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -52,15 +52,15 @@ export const registerCommandResponders = async () => { //start adding user to ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:add-ticket-user").run(source,{guild,channel,user,ticket,reason,sendMessage:false,data}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:add-message").build(source,{guild,channel,user,ticket,reason,data})) + await opendiscord.actions.get("opendiscord:add-ticket-user").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,data}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:add-message").build(origin,{guild,channel,user,ticket,reason,data})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'add' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/autoclose.ts b/src/commands/autoclose.ts index bdca124..497f014 100644 --- a/src/commands/autoclose.ts +++ b/src/commands/autoclose.ts @@ -10,20 +10,20 @@ export const registerCommandResponders = async () => { //AUTOCLOSE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:autoclose",generalConfig.data.prefix,/^autoclose/)) opendiscord.responders.commands.get("opendiscord:autoclose").workers.add([ - new api.ODWorker("opendiscord:autoclose",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:autoclose",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.autoclose,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } //check is in guild/server if (!guild){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -54,14 +54,14 @@ export const registerCommandResponders = async () => { const reason = instance.options.getString("reason",false) ticket.get("opendiscord:autoclose-enabled").value = false ticket.get("opendiscord:autoclose-hours").value = 0 - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autoclose-disable").build(source,{guild,channel,user,ticket,reason})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autoclose-disable").build(origin,{guild,channel,user,ticket,reason})) }else if (scope == "enable"){ const time = instance.options.getNumber("time",true) const reason = instance.options.getString("reason",false) ticket.get("opendiscord:autoclose-enabled").value = true ticket.get("opendiscord:autoclose-hours").value = time - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autoclose-enable").build(source,{guild,channel,user,ticket,reason,time})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autoclose-enable").build(origin,{guild,channel,user,ticket,reason,time})) } //update ticket message @@ -80,14 +80,14 @@ export const registerCommandResponders = async () => { } } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { const scope = instance.options.getSubCommand() const reason = instance.options.getString("reason",false) opendiscord.log(instance.user.displayName+" used the 'autoclose "+scope+"' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"reason",value:reason ?? "/"}, ]) }) diff --git a/src/commands/autocomplete.ts b/src/commands/autocomplete.ts index 3c3869f..7b749a8 100644 --- a/src/commands/autocomplete.ts +++ b/src/commands/autocomplete.ts @@ -7,7 +7,7 @@ import * as discord from "discord.js" export const registerAutocompleteResponders = async () => { //PANEL ID AUTOCOMPLETE opendiscord.responders.autocomplete.add(new api.ODAutocompleteResponder("opendiscord:panel-id","panel","id")) - opendiscord.responders.autocomplete.get("opendiscord:panel-id").workers.add(new api.ODWorker("opendiscord:panel-id",0,async (instance,params,source,cancel) => { + opendiscord.responders.autocomplete.get("opendiscord:panel-id").workers.add(new api.ODWorker("opendiscord:panel-id",0,async (instance,params,origin,cancel) => { //create panel choices const panelChoices : {name:string, value:string}[] = [] opendiscord.configs.get("opendiscord:panels").data.forEach((panel) => { @@ -19,7 +19,7 @@ export const registerAutocompleteResponders = async () => { //OPTION ID AUTOCOMPLETE opendiscord.responders.autocomplete.add(new api.ODAutocompleteResponder("opendiscord:option-id",/ticket|move/,"id")) - opendiscord.responders.autocomplete.get("opendiscord:option-id").workers.add(new api.ODWorker("opendiscord:option-id",0,async (instance,params,source,cancel) => { + opendiscord.responders.autocomplete.get("opendiscord:option-id").workers.add(new api.ODWorker("opendiscord:option-id",0,async (instance,params,origin,cancel) => { //create ticket choices const ticketChoices : {name:string, value:string}[] = [] opendiscord.configs.get("opendiscord:options").data.forEach((option) => { diff --git a/src/commands/autodelete.ts b/src/commands/autodelete.ts index 29d63c4..7598a31 100644 --- a/src/commands/autodelete.ts +++ b/src/commands/autodelete.ts @@ -10,21 +10,21 @@ export const registerCommandResponders = async () => { //AUTODELETE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:autodelete",generalConfig.data.prefix,/^autodelete/)) opendiscord.responders.commands.get("opendiscord:autodelete").workers.add([ - new api.ODWorker("opendiscord:autodelete",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:autodelete",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.autodelete,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } //check is in guild/server if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -49,14 +49,14 @@ export const registerCommandResponders = async () => { const reason = instance.options.getString("reason",false) ticket.get("opendiscord:autodelete-enabled").value = false ticket.get("opendiscord:autodelete-days").value = 0 - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autodelete-disable").build(source,{guild,channel,user,ticket,reason})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autodelete-disable").build(origin,{guild,channel,user,ticket,reason})) }else if (scope == "enable"){ const time = instance.options.getNumber("time",true) const reason = instance.options.getString("reason",false) ticket.get("opendiscord:autodelete-enabled").value = true ticket.get("opendiscord:autodelete-days").value = time - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autodelete-enable").build(source,{guild,channel,user,ticket,reason,time})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:autodelete-enable").build(origin,{guild,channel,user,ticket,reason,time})) } //update ticket message @@ -75,14 +75,14 @@ export const registerCommandResponders = async () => { } } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { const scope = instance.options.getSubCommand() const reason = instance.options.getString("reason",false) opendiscord.log(instance.user.displayName+" used the 'autodelete "+scope+"' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"reason",value:reason ?? "/"}, ]) }) diff --git a/src/commands/blacklist.ts b/src/commands/blacklist.ts index 4f9dac2..cb4af2f 100644 --- a/src/commands/blacklist.ts +++ b/src/commands/blacklist.ts @@ -10,20 +10,20 @@ export const registerCommandResponders = async () => { //BLACKLIST COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:blacklist",generalConfig.data.prefix,/^blacklist/)) opendiscord.responders.commands.get("opendiscord:blacklist").workers.add([ - new api.ODWorker("opendiscord:blacklist",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:blacklist",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.blacklist,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } //check is in guild/server if (!guild){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -31,11 +31,11 @@ export const registerCommandResponders = async () => { const scope = instance.options.getSubCommand() if (!scope || (scope != "add" && scope != "get" && scope != "remove" && scope != "view")) return if (scope == "view"){ - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-view").build(source,{guild,channel,user})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-view").build(origin,{guild,channel,user})) }else if (scope == "get"){ const data = instance.options.getUser("user",true) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-get").build(source,{guild,channel,user,data})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-get").build(origin,{guild,channel,user,data})) }else if (scope == "add"){ const data = instance.options.getUser("user",true) @@ -46,7 +46,7 @@ export const registerCommandResponders = async () => { {key:"user",value:user.username}, {key:"userid",value:user.id,hidden:true}, {key:"channelid",value:channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"reason",value:reason ?? "/"} ]) @@ -54,7 +54,7 @@ export const registerCommandResponders = async () => { await opendiscord.statistics.get("opendiscord:global").setStat("opendiscord:users-blacklisted",1,"increase") await opendiscord.statistics.get("opendiscord:user").setStat("opendiscord:users-blacklisted",user.id,1,"increase") - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-add").build(source,{guild,channel,user,data,reason})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-add").build(origin,{guild,channel,user,data,reason})) }else if (scope == "remove"){ const data = instance.options.getUser("user",true) @@ -65,14 +65,14 @@ export const registerCommandResponders = async () => { {key:"user",value:user.username}, {key:"userid",value:user.id,hidden:true}, {key:"channelid",value:channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"reason",value:reason ?? "/"} ]) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-remove").build(source,{guild,channel,user,data,reason})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-remove").build(origin,{guild,channel,user,data,reason})) } }), - new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:discord-logs",1,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild) return @@ -85,19 +85,19 @@ export const registerCommandResponders = async () => { //to logs if (generalConfig.data.system.logs.enabled && generalConfig.data.system.messages.blacklisting.logs){ const logChannel = opendiscord.posts.get("opendiscord:logs") - if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-logs").build(source,{guild,channel,user,mode:scope,data,reason})) + if (logChannel) logChannel.send(await opendiscord.builders.messages.getSafe("opendiscord:blacklist-logs").build(origin,{guild,channel,user,mode:scope,data,reason})) } //to dm - if (generalConfig.data.system.messages.blacklisting.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:blacklist-dm").build(source,{guild,channel,user,mode:scope,data,reason})) + if (generalConfig.data.system.messages.blacklisting.dm) await opendiscord.client.sendUserDm(user,await opendiscord.builders.messages.getSafe("opendiscord:blacklist-dm").build(origin,{guild,channel,user,mode:scope,data,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { const scope = instance.options.getSubCommand() opendiscord.log(instance.user.displayName+" used the 'blacklist "+scope+"' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/claim.ts b/src/commands/claim.ts index aea8e40..438db8d 100644 --- a/src/commands/claim.ts +++ b/src/commands/claim.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //CLAIM COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:claim",generalConfig.data.prefix,"claim")) opendiscord.responders.commands.get("opendiscord:claim").workers.add([ - new api.ODWorker("opendiscord:claim",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:claim",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.claim,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -51,15 +51,15 @@ export const registerCommandResponders = async () => { //start claiming ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:claim-ticket").run(source,{guild,channel,user:claimUser,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:claim-message").build(source,{guild,channel,user:claimUser,ticket,reason})) + await opendiscord.actions.get("opendiscord:claim-ticket").run(origin,{guild,channel,user:claimUser,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:claim-message").build(origin,{guild,channel,user:claimUser,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'claim' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -69,11 +69,11 @@ export const registerButtonResponders = async () => { //CLAIM TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:claim-ticket",/^od:claim-ticket/)) opendiscord.responders.buttons.get("opendiscord:claim-ticket").workers.add( - new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:claim-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:claim-ticket-ticket-message").activate(instance) - else if (originalSource == "unclaim-message") await opendiscord.verifybars.get("opendiscord:claim-ticket-unclaim-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:claim-ticket-ticket-message").activate(instance) + else if (originalOrigin == "unclaim-message") await opendiscord.verifybars.get("opendiscord:claim-ticket-unclaim-message").activate(instance) else await instance.defer("update",false) }) ) @@ -83,12 +83,12 @@ export const registerModalResponders = async () => { //CLAIM WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:claim-ticket-reason",/^od:claim-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:claim-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:claim-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:claim-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -97,21 +97,21 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //claim with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:claim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:claim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "unclaim-message"){ + }else if (originalOrigin == "unclaim-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:claim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:claim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:claim-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:claim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:claim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) diff --git a/src/commands/clear.ts b/src/commands/clear.ts index 7a1c1af..d0759a5 100644 --- a/src/commands/clear.ts +++ b/src/commands/clear.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //CLEAR COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:clear",generalConfig.data.prefix,"clear")) opendiscord.responders.commands.get("opendiscord:clear").workers.add([ - new api.ODWorker("opendiscord:clear",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:clear",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions (only allow global admins: ticket admins aren't allowed to clear tickets) const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.clear,"support",user,member,channel,guild,{allowChannelUserScope:false,allowChannelRoleScope:false}) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -48,14 +48,14 @@ export const registerCommandResponders = async () => { //reply with clear verify await instance.defer(true) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:clear-verify-message").build(source,{guild,channel,user,filter,list})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:clear-verify-message").build(origin,{guild,channel,user,filter,list})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'clear' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -65,10 +65,10 @@ export const registerButtonResponders = async () => { //CLEAR CONTINUE BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:clear-continue",/^od:clear-continue_/)) opendiscord.responders.buttons.get("opendiscord:clear-continue").workers.add( - new api.ODWorker("opendiscord:clear-continue",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:clear-continue",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild || channel.isDMBased()) return - const originalSource = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:clear-tickets"]["origin"] + const originalOrigin = instance.interaction.customId.split("_")[1] as api.ODActionManagerIdMappings["opendiscord:clear-tickets"]["origin"] const filter = instance.interaction.customId.split("_")[2] as api.ODTicketClearFilter //start ticket clear @@ -90,8 +90,8 @@ export const registerButtonResponders = async () => { if (ticketChannel) list.push("#"+ticketChannel.name) } - await opendiscord.actions.get("opendiscord:clear-tickets").run(originalSource,{guild,channel,user,filter,list:ticketList}) - await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:clear-message").build(originalSource,{guild,channel,user,filter,list})) + await opendiscord.actions.get("opendiscord:clear-tickets").run(originalOrigin,{guild,channel,user,filter,list:ticketList}) + await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:clear-message").build(originalOrigin,{guild,channel,user,filter,list})) }) ) } \ No newline at end of file diff --git a/src/commands/close.ts b/src/commands/close.ts index 75091c1..27acd80 100644 --- a/src/commands/close.ts +++ b/src/commands/close.ts @@ -11,14 +11,14 @@ export const registerCommandResponders = async () => { //CLOSE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:close",generalConfig.data.prefix,"close")) opendiscord.responders.commands.get("opendiscord:close").workers.add([ - new api.ODWorker("opendiscord:close",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:close",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.close,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -63,15 +63,15 @@ export const registerCommandResponders = async () => { //start closing ticket await instance.defer(false) const reason = instance.options.getString("reason",false) - await opendiscord.actions.get("opendiscord:close-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:close-message").build(source,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:close-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:close-message").build(origin,{guild,channel,user,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'close' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -81,11 +81,11 @@ export const registerButtonResponders = async () => { //CLOSE TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:close-ticket",/^od:close-ticket_/)) opendiscord.responders.buttons.get("opendiscord:close-ticket").workers.add( - new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:close-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:close-ticket-ticket-message").activate(instance) - else if (originalSource == "reopen-message") await opendiscord.verifybars.get("opendiscord:close-ticket-reopen-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:close-ticket-ticket-message").activate(instance) + else if (originalOrigin == "reopen-message") await opendiscord.verifybars.get("opendiscord:close-ticket-reopen-message").activate(instance) else await instance.defer("update",false) }) ) @@ -95,12 +95,12 @@ export const registerModalResponders = async () => { //CLOSE WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:close-ticket-reason",/^od:close-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:close-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:close-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:close-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -109,21 +109,21 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //close with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:close-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:close-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "reopen-message"){ + }else if (originalOrigin == "reopen-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:close-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:close-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:close-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:close-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:close-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) diff --git a/src/commands/delete.ts b/src/commands/delete.ts index 9d45a89..394a1f9 100644 --- a/src/commands/delete.ts +++ b/src/commands/delete.ts @@ -11,14 +11,14 @@ export const registerCommandResponders = async () => { //DELETE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:delete",generalConfig.data.prefix,"delete")) opendiscord.responders.commands.get("opendiscord:delete").workers.add([ - new api.ODWorker("opendiscord:delete",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.delete,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -67,15 +67,15 @@ export const registerCommandResponders = async () => { //start deleting ticket await instance.defer(false) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build(source,{guild,channel,user,ticket,reason})) - await opendiscord.actions.get("opendiscord:delete-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build(origin,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:delete-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript}) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'delete' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -85,13 +85,13 @@ export const registerButtonResponders = async () => { //DELETE TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:delete-ticket",/^od:delete-ticket/)) opendiscord.responders.buttons.get("opendiscord:delete-ticket").workers.add( - new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:delete-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-ticket-message").activate(instance) - else if (originalSource == "close-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-close-message").activate(instance) - else if (originalSource == "reopen-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-reopen-message").activate(instance) - else if (originalSource == "autoclose-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-autoclose-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-ticket-message").activate(instance) + else if (originalOrigin == "close-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-close-message").activate(instance) + else if (originalOrigin == "reopen-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-reopen-message").activate(instance) + else if (originalOrigin == "autoclose-message") await opendiscord.verifybars.get("opendiscord:delete-ticket-autoclose-message").activate(instance) else await instance.defer("update",false) }) ) @@ -101,12 +101,12 @@ export const registerModalResponders = async () => { //REOPEN WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:delete-ticket-reason",/^od:delete-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:delete-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:delete-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:delete-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -115,36 +115,36 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //delete with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true,withoutTranscript:false}) //update ticket (for ticket message) => no-await doesn't wait for the action to set this variable ticket.get("opendiscord:for-deletion").value = true await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "close-message"){ + }else if (originalOrigin == "close-message"){ await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build("other",{guild,channel,user,ticket,reason})) - }else if (originalSource == "reopen-message"){ + }else if (originalOrigin == "reopen-message"){ await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build("other",{guild,channel,user,ticket,reason})) - }else if (originalSource == "autoclose-message"){ + }else if (originalOrigin == "autoclose-message"){ await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false,withoutTranscript:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:delete-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) //don't await DELETE action => else it will update the message after the channel has been deleted - opendiscord.actions.get("opendiscord:delete-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true,withoutTranscript:false}) + opendiscord.actions.get("opendiscord:delete-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true,withoutTranscript:false}) } }) ]) diff --git a/src/commands/help.ts b/src/commands/help.ts index 7dd06dd..2f18048 100644 --- a/src/commands/help.ts +++ b/src/commands/help.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //HELP COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:help",generalConfig.data.prefix,"help")) opendiscord.responders.commands.get("opendiscord:help").workers.add([ - new api.ODWorker("opendiscord:help",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:help",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.help,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -27,14 +27,14 @@ export const registerCommandResponders = async () => { else if (!generalConfig.data.slashCommands) mode = "text" else mode = "slash" - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:help-menu").build(source,{mode,page:0})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:help-menu").build(origin,{mode,page:0})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'help' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -44,7 +44,7 @@ export const registerButtonResponders = async () => { //HELP MENU SWITCH BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:help-menu-switch",/^od:help-menu-switch_(slash|text)/)) opendiscord.responders.buttons.get("opendiscord:help-menu-switch").workers.add( - new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,origin,cancel) => { const mode = instance.interaction.customId.split("_")[1] as "slash"|"text" const pageButton = instance.getMessageComponent("button",/^od:help-menu-page_([0-9]+)/) const currentPage = (pageButton && pageButton.customId) ? Number(pageButton.customId.split("_")[1]) : 0 @@ -59,7 +59,7 @@ export const registerButtonResponders = async () => { //HELP MENU PREVIOUS BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:help-menu-previous",/^od:help-menu-previous/)) opendiscord.responders.buttons.get("opendiscord:help-menu-previous").workers.add( - new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,origin,cancel) => { const switchButton = instance.getMessageComponent("button",/^od:help-menu-switch_(slash|text)/) const pageButton = instance.getMessageComponent("button",/^od:help-menu-page_([0-9]+)/) const currentPage = (pageButton && pageButton.customId) ? Number(pageButton.customId.split("_")[1]) : 0 @@ -73,7 +73,7 @@ export const registerButtonResponders = async () => { //HELP MENU NEXT BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:help-menu-next",/^od:help-menu-next/)) opendiscord.responders.buttons.get("opendiscord:help-menu-next").workers.add( - new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:update-help-menu",0,async (instance,params,origin,cancel) => { const switchButton = instance.getMessageComponent("button",/^od:help-menu-switch_(slash|text)/) const pageButton = instance.getMessageComponent("button",/^od:help-menu-page_([0-9]+)/) const currentPage = (pageButton && pageButton.customId) ? Number(pageButton.customId.split("_")[1]) : 0 diff --git a/src/commands/move.ts b/src/commands/move.ts index 2177a0a..b436c08 100644 --- a/src/commands/move.ts +++ b/src/commands/move.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //MOVE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:move",generalConfig.data.prefix,"move")) opendiscord.responders.commands.get("opendiscord:move").workers.add([ - new api.ODWorker("opendiscord:move",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:move",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.move,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -56,15 +56,15 @@ export const registerCommandResponders = async () => { //start moving ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:move-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false,data:option}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:move-message").build(source,{guild,channel,user,ticket,reason,data:option})) + await opendiscord.actions.get("opendiscord:move-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,data:option}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:move-message").build(origin,{guild,channel,user,ticket,reason,data:option})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'move' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/panel.ts b/src/commands/panel.ts index c9b041d..aa56b7d 100644 --- a/src/commands/panel.ts +++ b/src/commands/panel.ts @@ -10,20 +10,20 @@ export const registerCommandResponders = async () => { //PANEL COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:panel",generalConfig.data.prefix,/^panel/)) opendiscord.responders.commands.get("opendiscord:panel").workers.add([ - new api.ODWorker("opendiscord:panel",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:panel",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.panel,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } //check is in guild/server if (!guild || instance.channel.type == discord.ChannelType.GroupDM){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -31,12 +31,12 @@ export const registerCommandResponders = async () => { const id = instance.options.getString("id",true) const panel = opendiscord.panels.get(id) if (!panel){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-panel-unknown").build(source,{guild,channel,user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-panel-unknown").build(origin,{guild,channel,user})) return cancel() } - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:panel-ready").build(source,{guild,channel,user,panel})) - const panelMessage = await instance.channel.send((await opendiscord.builders.messages.getSafe("opendiscord:panel").build(source,{guild,channel,user,panel})).message) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:panel-ready").build(origin,{guild,channel,user,panel})) + const panelMessage = await instance.channel.send((await opendiscord.builders.messages.getSafe("opendiscord:panel").build(origin,{guild,channel,user,panel})).message) //add panel to database (this way, the bot knows where all panels are located) const globalDatabase = opendiscord.databases.get("opendiscord:global") @@ -47,12 +47,12 @@ export const registerCommandResponders = async () => { await globalDatabase.set("opendiscord:panel-update",panelMessage.channel.id+"_"+panelMessage.id,panel.id.value) } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'panel' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/pin.ts b/src/commands/pin.ts index b57d358..da4b17e 100644 --- a/src/commands/pin.ts +++ b/src/commands/pin.ts @@ -10,7 +10,7 @@ export const registerCommandResponders = async () => { //PIN COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:pin",generalConfig.data.prefix,"pin")) opendiscord.responders.commands.get("opendiscord:pin").workers.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.pin if (permissionMode == "none"){ @@ -21,36 +21,36 @@ export const registerCommandResponders = async () => { else if (permissionMode == "admin"){ if (!opendiscord.permissions.hasPermissions("support",await opendiscord.permissions.getPermissions(instance.user,instance.channel,instance.guild))){ //no permissions - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["support"]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["support"]})) return cancel() }else return }else{ if (!instance.guild || !instance.member){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #1",layout:"advanced"})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #1",layout:"advanced"})) return cancel() } const role = await opendiscord.client.fetchGuildRole(instance.guild,permissionMode) if (!role){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #2",layout:"advanced"})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #2",layout:"advanced"})) return cancel() } if (!role.members.has(instance.member.id)){ //no permissions - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:[]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:[]})) return cancel() }else return } }), - new api.ODWorker("opendiscord:pin",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:pin",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.pin,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -83,15 +83,15 @@ export const registerCommandResponders = async () => { //start pinning ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:pin-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:pin-message").build(source,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:pin-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:pin-message").build(origin,{guild,channel,user,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'pin' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -101,11 +101,11 @@ export const registerButtonResponders = async () => { //PIN TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:pin-ticket",/^od:pin-ticket/)) opendiscord.responders.buttons.get("opendiscord:pin-ticket").workers.add( - new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:pin-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:pin-ticket-ticket-message").activate(instance) - else if (originalSource == "unpin-message") await opendiscord.verifybars.get("opendiscord:pin-ticket-unpin-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:pin-ticket-ticket-message").activate(instance) + else if (originalOrigin == "unpin-message") await opendiscord.verifybars.get("opendiscord:pin-ticket-unpin-message").activate(instance) else await instance.defer("update",false) }) ) @@ -115,12 +115,12 @@ export const registerModalResponders = async () => { //PIN WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:pin-ticket-reason",/^od:pin-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:pin-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:pin-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:pin-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -129,21 +129,21 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //pin with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:pin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:pin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "unpin-message"){ + }else if (originalOrigin == "unpin-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:pin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:pin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:pin-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:pin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:pin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) diff --git a/src/commands/priority.ts b/src/commands/priority.ts index 6256281..da6c415 100644 --- a/src/commands/priority.ts +++ b/src/commands/priority.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //PRIORITY COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:priority",generalConfig.data.prefix,"priority")) opendiscord.responders.commands.get("opendiscord:priority").workers.add([ - new api.ODWorker("opendiscord:priority",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:priority",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.priority,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -56,21 +56,21 @@ export const registerCommandResponders = async () => { //start changing ticket priority await instance.defer(false) - await opendiscord.actions.get("opendiscord:update-ticket-priority").run(source,{guild,channel,user,ticket,newPriority:priority,sendMessage:false,reason}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:priority-set").build(source,{guild,channel,user,ticket,priority,reason})) + await opendiscord.actions.get("opendiscord:update-ticket-priority").run(origin,{guild,channel,user,ticket,newPriority:priority,sendMessage:false,reason}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:priority-set").build(origin,{guild,channel,user,ticket,priority,reason})) }else if (scope == "get"){ const priority = opendiscord.priorities.getFromPriorityLevel(ticket.get("opendiscord:priority").value) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:priority-get").build(source,{guild,channel,user,ticket,priority})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:priority-get").build(origin,{guild,channel,user,ticket,priority})) } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { const scope = instance.options.getSubCommand() opendiscord.log(instance.user.displayName+" used the 'priority "+scope+"' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/remove.ts b/src/commands/remove.ts index a7a0eb2..3c0cbd0 100644 --- a/src/commands/remove.ts +++ b/src/commands/remove.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //REMOVE COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:remove",generalConfig.data.prefix,"remove")) opendiscord.responders.commands.get("opendiscord:remove").workers.add([ - new api.ODWorker("opendiscord:remove",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:remove",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.remove,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -52,15 +52,15 @@ export const registerCommandResponders = async () => { //start removing user from ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:remove-ticket-user").run(source,{guild,channel,user,ticket,reason,sendMessage:false,data}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:remove-message").build(source,{guild,channel,user,ticket,reason,data})) + await opendiscord.actions.get("opendiscord:remove-ticket-user").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,data}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:remove-message").build(origin,{guild,channel,user,ticket,reason,data})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'remove' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/rename.ts b/src/commands/rename.ts index 8da0883..6090abc 100644 --- a/src/commands/rename.ts +++ b/src/commands/rename.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //RENAME COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:rename",generalConfig.data.prefix,"rename")) opendiscord.responders.commands.get("opendiscord:rename").workers.add([ - new api.ODWorker("opendiscord:rename",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:rename",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.rename,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -45,15 +45,15 @@ export const registerCommandResponders = async () => { //start renaming ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:rename-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false,data:name}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:rename-message").build(source,{guild,channel,user,ticket,reason,data:name})) + await opendiscord.actions.get("opendiscord:rename-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,data:name}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:rename-message").build(origin,{guild,channel,user,ticket,reason,data:name})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'rename' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/reopen.ts b/src/commands/reopen.ts index 5c4d6e1..fd3d349 100644 --- a/src/commands/reopen.ts +++ b/src/commands/reopen.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //REOPEN COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:reopen",generalConfig.data.prefix,"reopen")) opendiscord.responders.commands.get("opendiscord:reopen").workers.add([ - new api.ODWorker("opendiscord:reopen",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen",0,async (instance,params,origin,cancel) => { const {guild,channel,user,member} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.reopen,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -50,15 +50,15 @@ export const registerCommandResponders = async () => { //start reopening ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:reopen-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build(source,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:reopen-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build(origin,{guild,channel,user,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'reopen' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -68,12 +68,12 @@ export const registerButtonResponders = async () => { //REOPEN TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:reopen-ticket",/^od:reopen-ticket/)) opendiscord.responders.buttons.get("opendiscord:reopen-ticket").workers.add( - new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:reopen-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-ticket-message").activate(instance) - else if (originalSource == "close-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-close-message").activate(instance) - else if (originalSource == "autoclose-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-autoclose-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-ticket-message").activate(instance) + else if (originalOrigin == "close-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-close-message").activate(instance) + else if (originalOrigin == "autoclose-message") await opendiscord.verifybars.get("opendiscord:reopen-ticket-autoclose-message").activate(instance) else await instance.defer("update",false) }) ) @@ -83,12 +83,12 @@ export const registerModalResponders = async () => { //REOPEN WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:reopen-ticket-reason",/^od:reopen-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:reopen-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:reopen-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:reopen-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -97,25 +97,25 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //reopen with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "close-message"){ + }else if (originalOrigin == "close-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build("other",{guild,channel,user,ticket,reason})) - }else if (originalSource == "autoclose-message"){ + }else if (originalOrigin == "autoclose-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:reopen-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:reopen-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) diff --git a/src/commands/role.ts b/src/commands/role.ts index 19d8f73..06de874 100644 --- a/src/commands/role.ts +++ b/src/commands/role.ts @@ -10,12 +10,12 @@ export const registerButtonResponders = async () => { //ROLE OPTION BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:role-option",/^od:role-option_/)) opendiscord.responders.buttons.get("opendiscord:role-option").workers.add( - new api.ODWorker("opendiscord:role-option",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:role-option",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance //check is in guild/server if (!guild){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -24,7 +24,7 @@ export const registerButtonResponders = async () => { const option = opendiscord.options.get(optionId) if (!option || !(option instanceof api.ODRoleOption)){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) return cancel() } @@ -33,7 +33,7 @@ export const registerButtonResponders = async () => { const res = await opendiscord.actions.get("opendiscord:reaction-role").run("panel-button",{guild,user,option,overwriteMode:null}) if (!res.result || !res.role){ //error - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild,channel:instance.channel,user,error:"Unable to receive role update data from worker!",layout:"advanced"})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild,channel:instance.channel,user,error:"Unable to receive role update data from worker!",layout:"advanced"})) return cancel() } if (generalConfig.data.system.replyOnReactionRole) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:reaction-role").build("panel-button",{guild,user,role:res.role,result:res.result})) diff --git a/src/commands/stats.ts b/src/commands/stats.ts index ba42b80..b70b838 100644 --- a/src/commands/stats.ts +++ b/src/commands/stats.ts @@ -10,7 +10,7 @@ export const registerCommandResponders = async () => { //STATS COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:stats",generalConfig.data.prefix,/^stats/)) opendiscord.responders.commands.get("opendiscord:stats").workers.add([ - new api.ODWorker("opendiscord:permissions",1,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:permissions",1,async (instance,params,origin,cancel) => { const permissionMode = generalConfig.data.system.permissions.stats //command is disabled @@ -24,7 +24,7 @@ export const registerCommandResponders = async () => { if (instance.options.getSubCommand() == "reset"){ if (!opendiscord.permissions.hasPermissions("owner",await opendiscord.permissions.getPermissions(instance.user,instance.channel,instance.guild))){ //no permissions - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["owner","developer"]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["owner","developer"]})) return cancel() }else return } @@ -34,29 +34,29 @@ export const registerCommandResponders = async () => { else if (permissionMode == "admin"){ if (!opendiscord.permissions.hasPermissions("support",await opendiscord.permissions.getPermissions(instance.user,instance.channel,instance.guild))){ //no permissions - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["support"]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["support"]})) return cancel() }else return }else{ if (!instance.guild || !instance.member){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #1",layout:"advanced"})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #1",layout:"advanced"})) return cancel() } const role = await opendiscord.client.fetchGuildRole(instance.guild,permissionMode) if (!role){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #2",layout:"advanced"})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Permission Error: Not in Server #2",layout:"advanced"})) return cancel() } if (!role.members.has(instance.member.id)){ //no permissions - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:[]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:[]})) return cancel() }else return } }), - new api.ODWorker("opendiscord:stats",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:stats",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions @@ -67,7 +67,7 @@ export const registerCommandResponders = async () => { }else if (instance.options.getSubCommand() === "reset" && !opendiscord.permissions.hasPermissions("owner",await opendiscord.permissions.getPermissions(instance.user,instance.channel,instance.guild))){ //reset --> owner/developer role is required - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["owner","developer"]})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user,permissions:["owner","developer"]})) return cancel() }else{ @@ -75,14 +75,14 @@ export const registerCommandResponders = async () => { const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.stats,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } } //check is in guild/server if (!guild){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -91,27 +91,27 @@ export const registerCommandResponders = async () => { if (!scope || (scope != "global" && scope != "ticket" && scope != "user" && scope != "reset")) return if (scope == "global"){ - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-global").build(source,{guild,channel,user})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-global").build(origin,{guild,channel,user})) }else if (scope == "ticket"){ const id = instance.options.getChannel("ticket",false)?.id ?? channel.id const ticket = opendiscord.tickets.get(id) - if (ticket) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-ticket").build(source,{guild,channel,user,scopeData:ticket})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-ticket-unknown").build(source,{guild,channel,user,id})) + if (ticket) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-ticket").build(origin,{guild,channel,user,scopeData:ticket})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-ticket-unknown").build(origin,{guild,channel,user,id})) }else if (scope == "user"){ const statsUser = instance.options.getUser("user",false) ?? user - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-user").build(source,{guild,channel,user,scopeData:statsUser})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-user").build(origin,{guild,channel,user,scopeData:statsUser})) }else if (scope == "reset"){ const reason = instance.options.getString("reason",false) opendiscord.statistics.reset() - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-reset").build(source,{guild,channel,user,reason})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:stats-reset").build(origin,{guild,channel,user,reason})) } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { const scope = instance.options.getSubCommand() let data: string if (scope == "ticket"){ @@ -123,7 +123,7 @@ export const registerCommandResponders = async () => { {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source}, + {key:"method",value:origin}, {key:"data",value:data}, ]) }) diff --git a/src/commands/ticket.ts b/src/commands/ticket.ts index ea77eb4..9a35dee 100644 --- a/src/commands/ticket.ts +++ b/src/commands/ticket.ts @@ -7,20 +7,20 @@ import * as discord from "discord.js" const generalConfig = opendiscord.configs.get("opendiscord:general") const lang = opendiscord.languages -async function checkTicketCreationPerms(instance:api.ODButtonResponderInstance|api.ODDropdownResponderInstance|api.ODModalResponderInstance|api.ODCommandResponderInstance,source:api.ODActionManagerIdMappings["opendiscord:create-ticket-permissions"]["origin"],guild:discord.Guild,user:discord.User,option:api.ODTicketOption){ +async function checkTicketCreationPerms(instance:api.ODButtonResponderInstance|api.ODDropdownResponderInstance|api.ODModalResponderInstance|api.ODCommandResponderInstance,origin:api.ODActionManagerIdMappings["opendiscord:create-ticket-permissions"]["origin"],guild:discord.Guild,user:discord.User,option:api.ODTicketOption){ //check ticket permissions - const permsRes = await opendiscord.actions.get("opendiscord:create-ticket-permissions").run(source,{guild,user,option}) + const permsRes = await opendiscord.actions.get("opendiscord:create-ticket-permissions").run(origin,{guild,user,option}) if (!permsRes.valid && instance.channel){ //error - const newSource = (source === "slash" || source === "text") ? source : "other" - if (permsRes.reason == "blacklist") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-blacklisted").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user})) - else if (permsRes.reason == "cooldown") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-cooldown").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,until:permsRes.cooldownUntil})) - else if (permsRes.reason == "global-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"global"})) - else if (permsRes.reason == "global-user-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"global-user"})) - else if (permsRes.reason == "option-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"option"})) - else if (permsRes.reason == "option-user-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"option-user"})) - else if (permsRes.reason == "custom") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,layout:"simple",error:permsRes.customReason ?? lang.getTranslation("errors.descriptions.unableToCreateTicket")+" `Unknown invalid_permission_reason => no reason specified by plugin`",customTitle:lang.getTranslation("errors.titles.permissionError")})) - else instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(newSource,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Unknown invalid_permission reason => calculation failed #1",layout:"advanced"})) + const newOrigin = (origin === "slash" || origin === "text") ? origin : "other" + if (permsRes.reason == "blacklist") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-blacklisted").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user})) + else if (permsRes.reason == "cooldown") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-cooldown").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,until:permsRes.cooldownUntil})) + else if (permsRes.reason == "global-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"global"})) + else if (permsRes.reason == "global-user-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"global-user"})) + else if (permsRes.reason == "option-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"option"})) + else if (permsRes.reason == "option-user-limit") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions-limits").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,limit:"option-user"})) + else if (permsRes.reason == "custom") instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,layout:"simple",error:permsRes.customReason ?? lang.getTranslation("errors.descriptions.unableToCreateTicket")+" `Unknown invalid_permission_reason => no reason specified by plugin`",customTitle:lang.getTranslation("errors.titles.permissionError")})) + else instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(newOrigin,{guild:instance.guild,channel:instance.channel,user:instance.user,error:"Unknown invalid_permission reason => calculation failed #1",layout:"advanced"})) return false }else return true } @@ -29,20 +29,20 @@ export const registerCommandResponders = async () => { //TICKET COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:ticket",generalConfig.data.prefix,/^ticket/)) opendiscord.responders.commands.get("opendiscord:ticket").workers.add([ - new api.ODWorker("opendiscord:ticket",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:ticket",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.ticket,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } //check is in guild/server if (!guild){ - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -51,35 +51,35 @@ export const registerCommandResponders = async () => { const option = opendiscord.options.get(optionId) if (!option || !(option instanceof api.ODTicketOption)){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) return cancel() } //start ticket creation if (option.exists("opendiscord:questions") && option.get("opendiscord:questions").value.length > 0){ //send modal - instance.modal(await opendiscord.builders.modals.getSafe("opendiscord:ticket-questions").build(source,{guild,channel,user,option})) + instance.modal(await opendiscord.builders.modals.getSafe("opendiscord:ticket-questions").build(origin,{guild,channel,user,option})) }else{ //check ticket permissions - if (!(await checkTicketCreationPerms(instance,source,guild,user,option))) return cancel() + if (!(await checkTicketCreationPerms(instance,origin,guild,user,option))) return cancel() //create ticket await instance.defer(true) - const res = await opendiscord.actions.get("opendiscord:create-ticket").run(source,{guild,user,answers:[],option}) + const res = await opendiscord.actions.get("opendiscord:create-ticket").run(origin,{guild,user,answers:[],option}) if (!res.channel || !res.ticket){ //error - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) return cancel() } - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build(source,{guild,channel:res.channel,user,ticket:res.ticket})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build(origin,{guild,channel:res.channel,user,ticket:res.ticket})) } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'ticket' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -89,11 +89,11 @@ export const registerButtonResponders = async () => { //TICKET OPTION BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:ticket-option",/^od:ticket-option_/)) opendiscord.responders.buttons.get("opendiscord:ticket-option").workers.add( - new api.ODWorker("opendiscord:ticket-option",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:ticket-option",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -102,7 +102,7 @@ export const registerButtonResponders = async () => { const option = opendiscord.options.get(optionId) if (!option || !(option instanceof api.ODTicketOption)){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) return cancel() } @@ -120,7 +120,7 @@ export const registerButtonResponders = async () => { const res = await opendiscord.actions.get("opendiscord:create-ticket").run("panel-button",{guild,user,answers:[],option}) if (!res.channel || !res.ticket){ //error - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) return cancel() } if (generalConfig.data.system.replyOnTicketCreation) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build("panel-button",{guild,channel:res.channel,user,ticket:res.ticket})) @@ -133,11 +133,11 @@ export const registerDropdownResponders = async () => { //PANEL DROPDOWN TICKETS DROPDOWN RESPONDER opendiscord.responders.dropdowns.add(new api.ODDropdownResponder("opendiscord:panel-dropdown-tickets",/^od:panel-dropdown_/)) opendiscord.responders.dropdowns.get("opendiscord:panel-dropdown-tickets").workers.add( - new api.ODWorker("opendiscord:panel-dropdown-tickets",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:panel-dropdown-tickets",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel:instance.channel,user:instance.user})) return cancel() } @@ -146,7 +146,7 @@ export const registerDropdownResponders = async () => { const option = opendiscord.options.get(optionId) if (!option || !(option instanceof api.ODTicketOption)){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) return cancel() } @@ -164,7 +164,7 @@ export const registerDropdownResponders = async () => { const res = await opendiscord.actions.get("opendiscord:create-ticket").run("panel-dropdown",{guild,user,answers:[],option}) if (!res.channel || !res.ticket){ //error - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild,channel:instance.channel,user,error:"Unable to receive ticket or channel from callback! #1",layout:"advanced"})) return cancel() } if (generalConfig.data.system.replyOnTicketCreation) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build("panel-dropdown",{guild,channel:res.channel,user,ticket:res.ticket})) @@ -185,24 +185,24 @@ export const registerModalResponders = async () => { //TICKET QUESTIONS RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:ticket-questions",/^od:ticket-questions_/)) opendiscord.responders.modals.get("opendiscord:ticket-questions").workers.add([ - new api.ODWorker("opendiscord:ticket-questions",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:ticket-questions",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance await instance.defer((generalConfig.data.system.replyOnTicketCreation) ? "reply" : "update",true) if (!channel) throw new api.ODSystemError("The 'Ticket Questions' modal requires a channel for responding!") if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } - const originalSource = instance.interaction.customId.split("_")[2] as ("panel-button"|"panel-dropdown"|"slash"|"text"|"other") + const originalOrigin = instance.interaction.customId.split("_")[2] as ("panel-button"|"panel-dropdown"|"slash"|"text"|"other") //get option const optionId = instance.interaction.customId.split("_")[1] const option = opendiscord.options.get(optionId) if (!option || !(option instanceof api.ODTicketOption)){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(source,{guild:instance.guild,channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-option-unknown").build(origin,{guild:instance.guild,channel,user:instance.user})) return cancel() } @@ -229,16 +229,16 @@ export const registerModalResponders = async () => { }) //check ticket permissions - if (!(await checkTicketCreationPerms(instance,originalSource,guild,user,option))) return cancel() + if (!(await checkTicketCreationPerms(instance,originalOrigin,guild,user,option))) return cancel() //create ticket - const res = await opendiscord.actions.get("opendiscord:create-ticket").run(originalSource,{guild,user,answers,option}) + const res = await opendiscord.actions.get("opendiscord:create-ticket").run(originalOrigin,{guild,user,answers,option}) if (!res.channel || !res.ticket){ //error - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(source,{guild,channel,user,error:"Unable to receive ticket or channel from callback! #2",layout:"advanced"})) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error").build(origin,{guild,channel,user,error:"Unable to receive ticket or channel from callback! #2",layout:"advanced"})) return cancel() } - if (generalConfig.data.system.replyOnTicketCreation) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build(originalSource,{guild,channel:res.channel,user,ticket:res.ticket})) + if (generalConfig.data.system.replyOnTicketCreation) await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:ticket-created").build(originalOrigin,{guild,channel:res.channel,user,ticket:res.ticket})) }) ]) } \ No newline at end of file diff --git a/src/commands/topic.ts b/src/commands/topic.ts index 38cd613..3ebece5 100644 --- a/src/commands/topic.ts +++ b/src/commands/topic.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //TOPIC COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:topic",generalConfig.data.prefix,"topic")) opendiscord.responders.commands.get("opendiscord:topic").workers.add([ - new api.ODWorker("opendiscord:topic",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:topic",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.topic,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -48,16 +48,16 @@ export const registerCommandResponders = async () => { const topic = instance.options.getString("topic",true) //start changing ticket topic await instance.defer(false) - await opendiscord.actions.get("opendiscord:update-ticket-topic").run(source,{guild,channel,user,ticket,newTopic:topic,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:topic-set").build(source,{guild,channel,user,ticket,topic})) + await opendiscord.actions.get("opendiscord:update-ticket-topic").run(origin,{guild,channel,user,ticket,newTopic:topic,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:topic-set").build(origin,{guild,channel,user,ticket,topic})) } }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'topic set' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/transfer.ts b/src/commands/transfer.ts index 01840fd..1c53342 100644 --- a/src/commands/transfer.ts +++ b/src/commands/transfer.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //TRANSFER COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:transfer",generalConfig.data.prefix,"transfer")) opendiscord.responders.commands.get("opendiscord:transfer").workers.add([ - new api.ODWorker("opendiscord:transfer",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:transfer",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.transfer,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -46,15 +46,15 @@ export const registerCommandResponders = async () => { //start transferring ticket ownership await instance.defer(false) - await opendiscord.actions.get("opendiscord:transfer-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false,newCreator}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:transfer-message").build(source,{guild,channel,user,ticket,oldCreator,newCreator,reason})) + await opendiscord.actions.get("opendiscord:transfer-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false,newCreator}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:transfer-message").build(origin,{guild,channel,user,ticket,oldCreator,newCreator,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'transfer' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) diff --git a/src/commands/unclaim.ts b/src/commands/unclaim.ts index 690b836..3d8662f 100644 --- a/src/commands/unclaim.ts +++ b/src/commands/unclaim.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //UNCLAIM COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:unclaim",generalConfig.data.prefix,"unclaim")) opendiscord.responders.commands.get("opendiscord:unclaim").workers.add([ - new api.ODWorker("opendiscord:unclaim",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unclaim",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.unclaim,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -50,15 +50,15 @@ export const registerCommandResponders = async () => { //start unclaiming ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:unclaim-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:unclaim-message").build(source,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:unclaim-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:unclaim-message").build(origin,{guild,channel,user,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'unclaim' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -68,11 +68,11 @@ export const registerButtonResponders = async () => { //UNCLAIM TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:unclaim-ticket",/^od:unclaim-ticket/)) opendiscord.responders.buttons.get("opendiscord:unclaim-ticket").workers.add( - new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:unclaim-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:unclaim-ticket-ticket-message").activate(instance) - else if (originalSource == "claim-message") await opendiscord.verifybars.get("opendiscord:unclaim-ticket-claim-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:unclaim-ticket-ticket-message").activate(instance) + else if (originalOrigin == "claim-message") await opendiscord.verifybars.get("opendiscord:unclaim-ticket-claim-message").activate(instance) else await instance.defer("update",false) }) ) @@ -82,12 +82,12 @@ export const registerModalResponders = async () => { //UNCLAIM WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:unclaim-ticket-reason",/^od:unclaim-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:unclaim-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:unclaim-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unclaim-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -96,21 +96,21 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //unclaim with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "claim-message"){ + }else if (originalOrigin == "claim-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:unclaim-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:unclaim-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) ]) diff --git a/src/commands/unpin.ts b/src/commands/unpin.ts index 9852c7f..00f2dbe 100644 --- a/src/commands/unpin.ts +++ b/src/commands/unpin.ts @@ -10,14 +10,14 @@ export const registerCommandResponders = async () => { //UNPIN COMMAND RESPONDER opendiscord.responders.commands.add(new api.ODCommandResponder("opendiscord:unpin",generalConfig.data.prefix,"unpin")) opendiscord.responders.commands.get("opendiscord:unpin").workers.add([ - new api.ODWorker("opendiscord:unpin",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unpin",0,async (instance,params,origin,cancel) => { const {user,member,channel,guild} = instance //check permissions const permsResult = await opendiscord.permissions.checkCommandPerms(generalConfig.data.system.permissions.unpin,"support",user,member,channel,guild) if (!permsResult.hasPerms){ if (permsResult.reason == "not-in-server") await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build("button",{channel,user})) - else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(source,{guild,channel,user,permissions:["support"]})) + else await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-no-permissions").build(origin,{guild,channel,user,permissions:["support"]})) return cancel() } @@ -50,15 +50,15 @@ export const registerCommandResponders = async () => { //start unpinning ticket await instance.defer(false) - await opendiscord.actions.get("opendiscord:unpin-ticket").run(source,{guild,channel,user,ticket,reason,sendMessage:false}) - await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:unpin-message").build(source,{guild,channel,user,ticket,reason})) + await opendiscord.actions.get("opendiscord:unpin-ticket").run(origin,{guild,channel,user,ticket,reason,sendMessage:false}) + await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:unpin-message").build(origin,{guild,channel,user,ticket,reason})) }), - new api.ODWorker("opendiscord:logs",-1,(instance,params,source,cancel) => { + new api.ODWorker("opendiscord:logs",-1,(instance,params,origin,cancel) => { opendiscord.log(instance.user.displayName+" used the 'unpin' command!","info",[ {key:"user",value:instance.user.username}, {key:"userid",value:instance.user.id,hidden:true}, {key:"channelid",value:instance.channel.id,hidden:true}, - {key:"method",value:source} + {key:"method",value:origin} ]) }) ]) @@ -68,11 +68,11 @@ export const registerButtonResponders = async () => { //UNPIN TICKET BUTTON RESPONDER opendiscord.responders.buttons.add(new api.ODButtonResponder("opendiscord:unpin-ticket",/^od:unpin-ticket/)) opendiscord.responders.buttons.get("opendiscord:unpin-ticket").workers.add( - new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,source,cancel) => { - const originalSource = instance.interaction.customId.split("_")[1] as Exclude + new api.ODWorker("opendiscord:unpin-ticket",0,async (instance,params,origin,cancel) => { + const originalOrigin = instance.interaction.customId.split("_")[1] as Exclude - if (originalSource == "ticket-message") await opendiscord.verifybars.get("opendiscord:unpin-ticket-ticket-message").activate(instance) - else if (originalSource == "pin-message") await opendiscord.verifybars.get("opendiscord:unpin-ticket-pin-message").activate(instance) + if (originalOrigin == "ticket-message") await opendiscord.verifybars.get("opendiscord:unpin-ticket-ticket-message").activate(instance) + else if (originalOrigin == "pin-message") await opendiscord.verifybars.get("opendiscord:unpin-ticket-pin-message").activate(instance) else await instance.defer("update",false) }) ) @@ -82,12 +82,12 @@ export const registerModalResponders = async () => { //UNPIN WITH REASON MODAL RESPONDER opendiscord.responders.modals.add(new api.ODModalResponder("opendiscord:unpin-ticket-reason",/^od:unpin-ticket-reason_/)) opendiscord.responders.modals.get("opendiscord:unpin-ticket-reason").workers.add([ - new api.ODWorker("opendiscord:unpin-ticket-reason",0,async (instance,params,source,cancel) => { + new api.ODWorker("opendiscord:unpin-ticket-reason",0,async (instance,params,origin,cancel) => { const {guild,channel,user} = instance if (!channel) return if (!guild){ //error - instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(source,{channel,user:instance.user})) + instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-not-in-guild").build(origin,{channel,user:instance.user})) return cancel() } const ticket = opendiscord.tickets.get(instance.interaction.customId.split("_")[1]) @@ -96,21 +96,21 @@ export const registerModalResponders = async () => { return } - const originalSource = instance.interaction.customId.split("_")[2] as Exclude + const originalOrigin = instance.interaction.customId.split("_")[2] as Exclude const reason = instance.values.getTextField("reason",true) //unpin with reason - if (originalSource == "ticket-message"){ + if (originalOrigin == "ticket-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:ticket-message").build("other",{guild,channel,user,ticket})) - }else if (originalSource == "pin-message"){ + }else if (originalOrigin == "pin-message"){ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:false}) + await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:false}) await instance.update(await opendiscord.builders.messages.getSafe("opendiscord:unpin-message").build("other",{guild,channel,user,ticket,reason})) }else{ await instance.defer("update",false) - await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalSource,{guild,channel,user,ticket,reason,sendMessage:true}) + await opendiscord.actions.get("opendiscord:unpin-ticket").run(originalOrigin,{guild,channel,user,ticket,reason,sendMessage:true}) } }) ]) diff --git a/src/data/framework/codeLoader.ts b/src/data/framework/codeLoader.ts index ef32ef4..d945305 100644 --- a/src/data/framework/codeLoader.ts +++ b/src/data/framework/codeLoader.ts @@ -36,22 +36,22 @@ export const loadCommandErrorHandlingCode = async () => { }) //responder timeout - opendiscord.responders.commands.setTimeoutErrorCallback(async (instance,source) => { - return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + opendiscord.responders.commands.setTimeoutErrorCallback(async (instance,origin) => { + return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) },null) - opendiscord.responders.buttons.setTimeoutErrorCallback(async (instance,source) => { - return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + opendiscord.responders.buttons.setTimeoutErrorCallback(async (instance,origin) => { + return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) },null) - opendiscord.responders.dropdowns.setTimeoutErrorCallback(async (instance,source) => { - return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + opendiscord.responders.dropdowns.setTimeoutErrorCallback(async (instance,origin) => { + return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) },null) - opendiscord.responders.modals.setTimeoutErrorCallback(async (instance,source) => { + opendiscord.responders.modals.setTimeoutErrorCallback(async (instance,origin) => { if (!instance.channel){ return await instance.reply({id:new api.ODId("opendiscord:unknown-error"), ephemeral:true, message:{ content:":x: **Something went wrong while replying to this modal!**" }}) } - return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(source,{guild:instance.guild,channel:instance.channel,user:instance.user})) + return await instance.reply(await opendiscord.builders.messages.getSafe("opendiscord:error-responder-timeout").build(origin,{guild:instance.guild,channel:instance.channel,user:instance.user})) },null) })) }