v2.5.0 first push

commands/add.js

@@ -22,18 +22,18 @@ module.exports = () => {
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            msg.channel.permissionOverwrites.create(user.id, { VIEW_CHANNEL:true, ADD_REACTIONS:true,ATTACH_FILES:true, EMBED_LINKS:true, SEND_MESSAGES:true})
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.userAddedTitle,l.commands.userAddedDescription.replace("{0}",user.tag))]})
+            msg.channel.permissionOverwrites.create(user.id, { ViewChannel:true, AddReactions:true,AttachFiles:true, EmbedLinks:true, SendMessages:true})
+            msg.channel.send({embeds:[bot.embeds.commands.addEmbed(user)]})
 
             var loguser = msg.mentions.users.first()
             log("command","someone used the 'add' command",[{key:"user",value:msg.author.tag}])
             log("system","user added to ticket",[{key:"user",value:msg.author.tag},{key:"ticket",value:msg.channel.name},{key:"added_user",value:loguser.tag}])
 
-            const ticketId = firstmsg.embeds[0].footer.text.split("Ticket Type: ")[1]
-            const ticketData = require("../core/getoptions").getOptionsById("newT"+ticketId)
+            const ticketData = require("../core/getoptions").getOptionsById("OTnewT"+ticketId)
             APIEvents.onTicketAdd(msg.author,loguser,msg.channel,msg.guild,new Date(),{status:"open",name:msg.channel.name,ticketOptions:ticketData})
 
             APIEvents.onCommand("add",permsChecker.command(msg.author.id,msg.guild.id),msg.author,msg.channel,msg.guild,new Date())
@@ -52,22 +52,20 @@ module.exports = () => {
             return
         }
 
-        interaction.deferReply()
-
         interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            interaction.channel.permissionOverwrites.create(user.id, { VIEW_CHANNEL:true, ADD_REACTIONS:true,ATTACH_FILES:true, EMBED_LINKS:true, SEND_MESSAGES:true})
-            interaction.reply({embeds:[bot.errorLog.success(l.commands.userAddedTitle,l.commands.userAddedDescription.replace("{0}",user.tag))]})
+            interaction.channel.permissionOverwrites.create(user.id, { ViewChannel:true, AddReactions:true,AttachFiles:true, EmbedLinks:true, SendMessages:true})
+            interaction.reply({embeds:[bot.embeds.commands.addEmbed(user)]})
 
             var loguser = user
             log("command","someone used the 'add' command",[{key:"user",value:interaction.user.tag}])
             log("system","user added to ticket",[{key:"user",value:interaction.user.tag},{key:"ticket",value:interaction.channel.name},{key:"added_user",value:loguser.tag}])
 
-            const ticketId = firstmsg.embeds[0].footer.text.split("Ticket Type: ")[1]
-            const ticketData = require("../core/getoptions").getOptionsById("newT"+ticketId)
+            const ticketData = require("../core/getoptions").getOptionsById("OTnewT"+ticketId)
             APIEvents.onTicketAdd(interaction.user,loguser,interaction.channel,interaction.guild,new Date(),{status:"open",name:interaction.channel.name,ticketOptions:ticketData})
             APIEvents.onCommand("add",permsChecker.command(interaction.user.id,interaction.guild.id),interaction.user,interaction.channel,interaction.guild,new Date())
             

commands/close.js

@@ -15,19 +15,22 @@ module.exports = () => {
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
-            
-            const closebutton = new discord.ActionRowBuilder()
-            .addComponents([
-                new discord.ButtonBuilder()
-                    .setCustomId("closeTicketTrue1")
-                    .setDisabled(false)
-                    .setStyle(discord.ButtonStyle.Secondary)
-                    .setEmoji("🔒")
-            ])
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.closeTitle,l.commands.closeDescription)],components:[closebutton]})
+            msg.channel.send({embeds:[bot.embeds.commands.closeEmbed(msg.author)],components:[bot.buttons.close.closeCommandRow]})
+
+            var name = msg.channel.name
+            var prefix = ""
+            const tickets = config.options
+            tickets.forEach((ticket) => {
+                if (name.startsWith(ticket.channelprefix)){
+                    prefix = ticket.channelprefix
+                }
+            })
+
+            require("../core/ticketCloser").NEWcloseTicket(msg.member,msg.channel,prefix,"close",false,true)
 
             log("command","someone used the 'close' command",[{key:"user",value:msg.author.tag}])
             APIEvents.onCommand("close",true,msg.author,msg.channel,msg.guild,new Date())
@@ -41,23 +44,26 @@ module.exports = () => {
         if (!interaction.isChatInputCommand()) return
         if (interaction.commandName != "close") return
 
-        interaction.deferReply()
+        //interaction.deferReply()
 
        interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
-            
-            const closebutton = new discord.ActionRowBuilder()
-            .addComponents([
-                new discord.ButtonBuilder()
-                    .setCustomId("closeTicketTrue1")
-                    .setDisabled(false)
-                    .setStyle(discord.ButtonStyle.Secondary)
-                    .setEmoji("🔒")
-            ])
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            interaction.reply({embeds:[bot.errorLog.success(l.commands.closeTitle,l.commands.closeDescription)],components:[closebutton]})
+            interaction.reply({embeds:[bot.embeds.commands.closeEmbed(interaction.user)],components:[bot.buttons.close.closeCommandRow]})
+
+            var name = interaction.channel.name
+            var prefix = ""
+            const tickets = config.options
+            tickets.forEach((ticket) => {
+                if (name.startsWith(ticket.channelprefix)){
+                    prefix = ticket.channelprefix
+                }
+            })
+
+            require("../core/ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"close",false,true)
 
             log("command","someone used the 'close' command",[{key:"user",value:interaction.user.tag}])
             APIEvents.onCommand("close",true,interaction.user,interaction.channel,interaction.guild,new Date())

commands/delete.js

@@ -20,19 +20,22 @@ module.exports = () => {
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
-            
-            const closebutton = new discord.ActionRowBuilder()
-            .addComponents([
-                new discord.ButtonBuilder()
-                    .setCustomId("deleteTicketTrue")
-                    .setDisabled(false)
-                    .setStyle(discord.ButtonStyle.Secondary)
-                    .setEmoji("❌")
-            ])
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.deleteTitle,l.commands.deleteDescription)],components:[closebutton]})
+            msg.channel.send({embeds:[bot.embeds.commands.deleteEmbed(msg.author)]})
+
+            var name = msg.channel.name
+            var prefix = ""
+            const tickets = config.options
+            tickets.forEach((ticket) => {
+                if (name.startsWith(ticket.channelprefix)){
+                    prefix = ticket.channelprefix
+                }
+            })
+
+            require("../core/ticketCloser").NEWcloseTicket(msg.member,msg.channel,prefix,"delete",false,true)
 
             log("command","someone used the 'delete' command",[{key:"user",value:msg.author.tag}])
             APIEvents.onCommand("delete",permsChecker.command(msg.author.id,msg.guild.id),msg.author,msg.channel,msg.guild,new Date())
@@ -45,7 +48,7 @@ module.exports = () => {
         if (!interaction.isChatInputCommand()) return
         if (interaction.commandName != "delete") return
 
-        interaction.deferReply()
+        //interaction.deferReply()
 
         if (!interaction.guild) return
         if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
@@ -53,23 +56,26 @@ module.exports = () => {
             return
         }
 
-       interaction.channel.messages.fetchPinned().then(msglist => {
+        interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
-            
-            const closebutton = new discord.ActionRowBuilder()
-            .addComponents([
-                new discord.ButtonBuilder()
-                    .setCustomId("deleteTicketTrue")
-                    .setDisabled(false)
-                    .setStyle(discord.ButtonStyle.Secondary)
-                    .setEmoji("❌")
-            ])
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            interaction.reply({embeds:[bot.errorLog.success(l.commands.deleteTitle,l.commands.deleteDescription)],components:[closebutton]})
+            interaction.reply({embeds:[bot.embeds.commands.deleteEmbed(interaction.user)]})
 
-            log("command","someone used the 'close' command",[{key:"user",value:interaction.user.tag}])
+            var name = interaction.channel.name
+            var prefix = ""
+            const tickets = config.options
+            tickets.forEach((ticket) => {
+                if (name.startsWith(ticket.channelprefix)){
+                    prefix = ticket.channelprefix
+                }
+            })
+
+            require("../core/ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"delete",false,true)
+
+            log("command","someone used the 'delete' command",[{key:"user",value:interaction.user.tag}])
             APIEvents.onCommand("delete",permsChecker.command(interaction.user.id,interaction.guild.id),interaction.user,interaction.channel,interaction.guild,new Date())
             
         })

commands/help.js

@@ -10,7 +10,7 @@ const APIEvents = require("../core/api/modules/events")
 module.exports = () => {
     const helpEmbed = new discord.EmbedBuilder()
         .setColor(config.main_color)
-        .setTitle(l.helpMenu.title)
+        .setTitle("❔ "+l.helpMenu.title)
 
     const prefix = config.prefix
     const header = config.system.ticket_channel ? l.helpMenu.header1.replace("{0}","<#"+config.system.ticket_channel+">") : l.helpMenu.header2
@@ -18,23 +18,25 @@ module.exports = () => {
 
     if (config.credits) helpEmbed.setFooter({text:"Open-Ticket by DJdj Development | view on github for source code",iconURL:"https://raw.githubusercontent.com/DJj123dj/open-ticket/main/logo.png"})
 
+    var otherprefix = prefix.endsWith(" ") ? prefix.substring(0,prefix.length-1) : prefix
 
     client.on("messageCreate",msg => {
         if (!msg.content.startsWith(config.prefix)) return
         var args = msg.content.split(config.prefix)
         
-        if (!args[1]){
+        if (msg.content == config.prefix || msg.content == config.prefix+" " || msg.content == otherprefix){
             msg.channel.send({embeds:[helpEmbed]})
             log("command","someone used the 'help' command",[{key:"user",value:msg.author.tag}])
             APIEvents.onCommand("help",true,msg.author,msg.channel,msg.guild,new Date())
             return
         }
 
-        if (!args[1].startsWith("close") && !args[1].startsWith("delete") && !args[1].startsWith("remove") && !args[1].startsWith("add") && !args[1].startsWith("msg") && !args[1].startsWith("remove") && !args[1].startsWith("rename") && !args[1].startsWith("reopen")){
-
-            msg.channel.send({embeds:[helpEmbed]})
-            log("command","someone used the 'help' command",[{key:"user",value:msg.author.tag}])
-            APIEvents.onCommand("help",true,msg.author,msg.channel,msg.guild,new Date())
+        if (args[1]){
+            if (!args[1].startsWith("close") && !args[1].startsWith("delete") && !args[1].startsWith("remove") && !args[1].startsWith("add") && !args[1].startsWith("msg") && !args[1].startsWith("remove") && !args[1].startsWith("rename") && !args[1].startsWith("reopen")){
+                msg.channel.send({embeds:[helpEmbed]})
+                log("command","someone used the 'help' command",[{key:"user",value:msg.author.tag}])
+                APIEvents.onCommand("help",true,msg.author,msg.channel,msg.guild,new Date())
+            }
         }
     })
 

commands/remove.js

@@ -20,30 +20,28 @@ module.exports = () => {
             return
         }
 
-        interaction.deferReply()
-
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
             msg.channel.permissionOverwrites.delete(user.id)
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.userRemovedTitle,l.commands.userRemovedDescription.replace("{0}",user.tag))]})
+            msg.channel.send({embeds:[bot.embeds.commands.removeEmbed(user)]})
 
             var loguser = msg.mentions.users.first()
             
             log("command","someone used the 'remove' command",[{key:"user",value:msg.author.tag}])
             log("system","user removed from ticket",[{key:"user",value:msg.author.tag},{key:"ticket",value:msg.channel.name},{key:"removed_user",value:loguser.tag}])
 
-            const ticketId = firstmsg.embeds[0].footer.text.split("Ticket Type: ")[1]
-            const ticketData = require("../core/getoptions").getOptionsById("newT"+ticketId)
+            const ticketData = require("../core/getoptions").getOptionsById("OTnewT"+ticketId)
             APIEvents.onTicketRemove(msg.author,loguser,msg.channel,msg.guild,new Date(),{status:"open",name:msg.channel.name,ticketOptions:ticketData})
             APIEvents.onCommand("remove",permsChecker.command(msg.author.id,msg.guild.id),msg.author,msg.channel,msg.guild,new Date())
         })
         
     })
 
-    client.on("interactionCreate",(interaction) => {
+    client.on("interactionCreate",async (interaction) => {
         if (!interaction.isChatInputCommand()) return
         if (interaction.commandName != "remove") return
         const user = interaction.options.getUser("user")
@@ -53,28 +51,24 @@ module.exports = () => {
             permsChecker.sendUserNoPerms(interaction.user)
             return
         }
-        
 
-
-        interaction.channel.messages.fetchPinned().then(msglist => {
+        await interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
             interaction.channel.permissionOverwrites.delete(user.id)
-            interaction.reply({embeds:[bot.errorLog.success(l.commands.userRemovedTitle,l.commands.userRemovedDescription.replace("{0}",user.tag))]})
+            interaction.reply({embeds:[bot.embeds.commands.removeEmbed(user)]})
 
             var loguser = user
             
             log("command","someone used the 'remove' command",[{key:"user",value:interaction.user.tag}])
             log("system","user removed from ticket",[{key:"user",value:interaction.user.tag},{key:"ticket",value:interaction.channel.name},{key:"removed_user",value:loguser.tag}])
 
-            const ticketId = firstmsg.embeds[0].footer.text.split("Ticket Type: ")[1]
-            const ticketData = require("../core/getoptions").getOptionsById("newT"+ticketId)
+            const ticketData = require("../core/getoptions").getOptionsById("OTnewT"+ticketId)
             APIEvents.onTicketRemove(interaction.user,loguser,interaction.channel,interaction.guild,new Date(),{status:"open",name:interaction.channel.name,ticketOptions:ticketData})
             APIEvents.onCommand("remove",permsChecker.command(interaction.user.id,interaction.guild.id),interaction.user,interaction.channel,interaction.guild,new Date())
         })
-
-       
     })
 }

commands/rename.js

@@ -12,16 +12,17 @@ module.exports = () => {
     client.on("messageCreate",msg => {
         if (!msg.content.startsWith(config.prefix+"rename")) return
 
+        if (!msg.guild) return
+        if (!permsChecker.command(msg.author.id,msg.guild.id)){
+            permsChecker.sendUserNoPerms(msg.author)
+            return
+        }
+
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
-
-            if (!msg.guild) return
-            if (!permsChecker.command(msg.author.id,msg.guild.id)){
-                permsChecker.sendUserNoPerms(msg.author)
-                return
-            }
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
             
             var newname = msg.content.split(config.prefix+"rename")[1].substring(1)
 
@@ -39,7 +40,7 @@ module.exports = () => {
             if (!prefix) prefix = "noprefix-"
 
             msg.channel.setName(prefix+newname)
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.renameTitle,l.commands.renameWarning)]})
+            msg.channel.send({embeds:[bot.embeds.commands.renameEmbed(msg.author,prefix+newname)]})
 
             log("command","someone used the 'rename' command",[{key:"user",value:msg.author.tag}])
             log("system","ticket renamed",[{key:"user",value:msg.author.tag},{key:"ticket",value:name},{key:"newname",value:newname}])
@@ -53,18 +54,19 @@ module.exports = () => {
         if (!interaction.isChatInputCommand()) return
         if (interaction.commandName != "rename") return
 
-        interaction.deferReply()
+        if (!interaction.guild) return
+        if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
+            permsChecker.sendUserNoPerms(interaction.user)
+            return
+        }
+
+        //interaction.deferReply()
 
         interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id)return interaction.reply({embeds:[bot.errorLog.notInATicket]})
-            
-            if (!interaction.guild) return
-            if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
-                permsChecker.sendUserNoPerms(interaction.user)
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
             
             var newname = interaction.options.getString("name")
             var name = interaction.channel.name
@@ -79,7 +81,7 @@ module.exports = () => {
             if (!prefix) prefix = "noprefix-"
 
             interaction.channel.setName(prefix+newname)
-            interaction.reply({embeds:[bot.errorLog.success(l.commands.renameTitle,l.commands.renameWarning)]})
+            interaction.reply({embeds:[bot.embeds.commands.renameEmbed(interaction.user,prefix+newname)]})
 
             log("command","someone used the 'rename' command",[{key:"user",value:interaction.user.tag}])
             log("system","ticket renamed",[{key:"user",value:interaction.user.tag},{key:"ticket",value:name},{key:"newname",value:newname}])

commands/reopen.js

@@ -9,25 +9,18 @@ const permsChecker = require("../core/utils/permisssionChecker")
 const APIEvents = require("../core/api/modules/events")
 
 module.exports = () => {
-    var reopenCommandBar = new discord.ActionRowBuilder()
-        .addComponents(
-            new discord.ButtonBuilder()
-                .setCustomId("reopenTicket1")
-                .setDisabled(false)
-                .setStyle(discord.ButtonStyle.Secondary)
-                .setEmoji("🔓")
-        )
-    
     client.on("messageCreate",msg => {
         if (!msg.content.startsWith(config.prefix+"reopen")) return
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
-
             if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            msg.channel.send({embeds:[bot.errorLog.success(l.commands.reopenTitle,l.commands.reopenDescription)],components:[reopenCommandBar]})
+            msg.channel.send({embeds:[bot.embeds.commands.reopenEmbed(msg.author)],components:[bot.buttons.close.openRowNormal]})
 
+            require("../core/ticketReopener").reopenTicket(msg.guild,msg.channel,msg.author)
             
             log("command","someone used the 'reopen' command",[{key:"user",value:msg.author.tag}])
             APIEvents.onCommand("reopen",true,msg.author,msg.channel,msg.guild,new Date())
@@ -39,19 +32,17 @@ module.exports = () => {
         if (!interaction.isChatInputCommand()) return
         if (interaction.commandName != "reopen") return
 
-        await interaction.deferReply()
+        //interaction.deferReply()
 
         interaction.channel.messages.fetchPinned().then(async msglist => {
             var firstmsg = msglist.last()
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
+            const hiddendata = bot.hiddenData.readHiddenData(firstmsg.embeds[0].description)
+            const ticketId = hiddendata.data.find(d => d.key == "type")
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
-
-            try {
-                await interaction.reply({embeds:[bot.errorLog.success(l.commands.reopenTitle,l.commands.reopenDescription)],components:[reopenCommandBar]})
-            }catch{
-                await interaction.editReply({embeds:[bot.errorLog.success(l.commands.reopenTitle,l.commands.reopenDescription)],components:[reopenCommandBar]})
-            }
+            await interaction.reply({embeds:[bot.embeds.commands.reopenEmbed(interaction.user)],components:[bot.buttons.close.openRowNormal]})
 
+            require("../core/ticketReopener").reopenTicket(interaction.guild,interaction.channel,interaction.user)
             
             log("command","someone used the 'reopen' command",[{key:"user",value:interaction.user.tag}])
             APIEvents.onCommand("reopen",true,interaction.user,interaction.channel,interaction.guild,new Date())