diff --git a/commands/delete.js b/commands/delete.js index 49adc26..5e2a6f1 100644 --- a/commands/delete.js +++ b/commands/delete.js @@ -53,7 +53,7 @@ module.exports = () => { if (!interaction.guild) return if (!permsChecker.command(interaction.user.id,interaction.guild.id)){ permsChecker.sendUserNoPerms(interaction.user) - return + return interaction.reply({embeds:[bot.errorLog.noPermsDelete]}) } interaction.channel.messages.fetchPinned().then(msglist => { diff --git a/core/api/modules/events.js b/core/api/modules/events.js index 150f2a5..f1a1c6d 100644 --- a/core/api/modules/events.js +++ b/core/api/modules/events.js @@ -176,15 +176,16 @@ exports.onTranscriptCreation = (messages,channel,guild,date) => { * @param {Date} date */ exports.onCommand = (type,hasPerms,user,channel,guild,date) => { + + const newguild = guild ? guild : false //system - bot.errorLog.log("api","someone used a command",[{key:"type",value:type},{key:"hasPerms",value:hasPerms},{key:"userid",value:user},{key:"channelid",value:channel.id},{key:"guildid",value:guild.id}]) + bot.errorLog.log("api","someone used a command",[{key:"type",value:type},{key:"hasPerms",value:hasPerms},{key:"userid",value:user},{key:"channelid",value:channel.id},{key:"guildid",value:newguild.id}]) commandListeners.forEach((func) => { try { - func(type,hasPerms,user,channel,guild,date) + func(type,hasPerms,user,channel,newguild,date) }catch{} }) - } /**@typedef {"add"|"remove"|"add&remove"} OTReactionRoleType */ @@ -273,7 +274,7 @@ exports.onCommand = (type,hasPerms,user,channel,guild,date) => { * @param {Boolean} hasPerms * @param {discord.User} user * @param {discord.TextChannel} channel - * @param {discord.Guild} guild + * @param {discord.Guild|false} guild * @param {Date} date */ diff --git a/core/interactionHandlers/handlers/accepted/closing.js b/core/interactionHandlers/handlers/accepted/closing.js index 0fa09ad..cc21393 100644 --- a/core/interactionHandlers/handlers/accepted/closing.js +++ b/core/interactionHandlers/handlers/accepted/closing.js @@ -35,7 +35,9 @@ module.exports = () => { if (!permissionChecker.sendUserNoPerms(interaction.user)){ permissionChecker.sendChannelNoPerms(interaction.channel) } - interaction.message.edit({components:firstcomponents}) + interaction.message.edit({components:[firstcomponents]}) + closeTicketButtonChecker = false + return } } diff --git a/core/interactionHandlers/handlers/accepted/deleting.js b/core/interactionHandlers/handlers/accepted/deleting.js index a2b39a4..9a64891 100644 --- a/core/interactionHandlers/handlers/accepted/deleting.js +++ b/core/interactionHandlers/handlers/accepted/deleting.js @@ -34,7 +34,9 @@ module.exports = () => { if (!permissionChecker.sendUserNoDelete(interaction.user)){ permissionChecker.sendChannelNoDelete(interaction.channel) } - interaction.message.edit({components:firstcomponents}) + await interaction.message.edit({components:[firstcomponents]}) + deleteTicketButtonChecker = false + return } /** @@ -51,29 +53,31 @@ module.exports = () => { interaction.channel.send({embeds:[bot.embeds.commands.deleteEmbed(interaction.user)]}) await interaction.message.edit({components:[bot.buttons.close.openRowDisabled]}) - console.log("hi") await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"delete",false,true) deleteTicketButtonChecker = false }) //DELETE NO TRANSCRIPT - var deleteTicketButtonChecker = false + var deleteTicketButtonChecker1 = false client.on("interactionCreate",async interaction => { if (!interaction.isButton()) return if (interaction.customId != "OTdeleteTicketTrue1") return interaction.deferUpdate() - if (deleteTicketButtonChecker == true) return - deleteTicketButtonChecker = true + if (deleteTicketButtonChecker1 == true) return + deleteTicketButtonChecker1 = true - const firstcomponents = bot.buttons.close.openRowNormal + const firstcomponents = bot.buttons.close.closeCommandRow + console.log("closed with NO TRANSCRIPT") if (!permissionChecker.command(interaction.user.id,interaction.guild.id)){ if (!permissionChecker.sendUserNoDelete(interaction.user)){ permissionChecker.sendChannelNoDelete(interaction.channel) } - interaction.message.edit({components:firstcomponents}) + await interaction.message.edit({components:[firstcomponents]}) + deleteTicketButtonChecker1 = false + return } /** @@ -90,6 +94,6 @@ module.exports = () => { interaction.channel.send({embeds:[bot.embeds.commands.deleteEmbed(interaction.user)]}) await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"deletenotranscript",false,true) - deleteTicketButtonChecker = false + deleteTicketButtonChecker1 = false }) } \ No newline at end of file diff --git a/core/interactionHandlers/handlers/sendTranscript.js b/core/interactionHandlers/handlers/sendTranscript.js index 9d2c2ba..0f857e3 100644 --- a/core/interactionHandlers/handlers/sendTranscript.js +++ b/core/interactionHandlers/handlers/sendTranscript.js @@ -38,6 +38,8 @@ module.exports = () => { return } + try { tsmsg.edit({embeds:[bot.embeds.commands.sendTranscriptEmbed(true,interaction.channel,interaction.user)],files:[fileattachment]}) + }catch{} }) } \ No newline at end of file diff --git a/core/interactionHandlers/handlers/verifyBars.js b/core/interactionHandlers/handlers/verifyBars.js index a85f388..64d7c99 100644 --- a/core/interactionHandlers/handlers/verifyBars.js +++ b/core/interactionHandlers/handlers/verifyBars.js @@ -56,7 +56,7 @@ module.exports = () => { if (interaction.customId != "OTdeleteTicket1") return interaction.deferUpdate() - interaction.message.edit({components:[bot.buttons.verifybars.deleteVerifyBar]}) + interaction.message.edit({components:[bot.buttons.verifybars.delete1VerifyBar]}) }) client.on("interactionCreate",interaction => { @@ -64,6 +64,6 @@ module.exports = () => { if (interaction.customId != "OTdeleteTicketFalse1") return interaction.deferUpdate() - interaction.message.edit({components:[bot.buttons.close.openRowNormal]}) + interaction.message.edit({components:[bot.buttons.close.closeCommandRow]}) }) } \ No newline at end of file diff --git a/core/ticketCloser.js b/core/ticketCloser.js index 4697bc2..203a04c 100755 --- a/core/ticketCloser.js +++ b/core/ticketCloser.js @@ -334,10 +334,13 @@ exports.NEWcloseTicket = async (member,channel,prefix,mode,reason,nomessage) => } if (deleteRequired){ - const timer = () => {return new Promise((resolve,reject) => { - setTimeout(() => {resolve(true)},7000) - })} - await timer() - await channel.delete() + //const timer = () => {return new Promise((resolve,reject) => { + // setTimeout(() => {resolve(true)},7000) + //})} + //await timer() + + setTimeout(async () => { + await channel.delete() + },6000) } } \ No newline at end of file diff --git a/core/ticketReopener.js b/core/ticketReopener.js index 593edd2..e3cbd97 100755 --- a/core/ticketReopener.js +++ b/core/ticketReopener.js @@ -35,7 +35,7 @@ const reopenTicket = (guild,channel,user) => { }) channel.permissionOverwrites.cache.forEach((p) => { - if (p.type == "member"){ + if (p.type == 1){ permissionsArray.push({ id:p.id, type:"member", diff --git a/index.js b/index.js index 48b8a5f..7fa703a 100644 --- a/index.js +++ b/index.js @@ -146,21 +146,21 @@ if (process.argv[2] && process.argv[2].startsWith("slash")){ }else{ //commands - require('./commands/ticket')(this) - require("./commands/help")(this) - require("./commands/close")(this) - require("./commands/delete")(this) - require("./commands/rename")(this) - require("./commands/add")(this) - require("./commands/remove")(this) - require("./commands/reopen")(this) + require('./commands/ticket')() + require("./commands/help")() + require("./commands/close")() + require("./commands/delete")() + require("./commands/rename")() + require("./commands/add")() + require("./commands/remove")() + require("./commands/reopen")() //core - require('./core/ticketOpener')(this) - require("./core/ticketCloser").runThis(this) - require("./core/closebuttons")(this) - require("./core/reactionRoles")(this) - require("./core/ticketReopener").runThis(this) + require('./core/ticketOpener')() + require("./core/ticketCloser").runThis() + //require("./core/closebuttons")() // => everything is now in ./core/interactionHandlers/ + require("./core/reactionRoles")() + require("./core/ticketReopener").runThis() //InteractionHandlers require("./core/interactionHandlers/handlers/handlers")() diff --git a/language/dutch.json b/language/dutch.json index 145e72c..4bd61eb 100644 --- a/language/dutch.json +++ b/language/dutch.json @@ -4,7 +4,7 @@ "missingArgsDescription":"Er missen parameters", "noPermsTitle":"Geen permissies!", "noPermsDescription":"Je hebt de `ADMINISTRATOR` permissie nodig of je moet in de lijst van toegestane users staan!", - "noPermsDelete":"Alleen admins kunnen een ticket sluiten!", + "noPermsDelete":"Alleen admins kunnen een ticket verwijderen!", "chooseFromListTitle":"Onjuist ID", "chooseFromListDescription":"Kies een van de id's hier onder:", "boterror":"Bot Error!",