v2.1.0 push 2

commands/add.js

@@ -7,24 +7,19 @@ module.exports = () => {
     client.on("messageCreate",msg => {
         if (!msg.content.startsWith(config.prefix+"add")) return
         var user = msg.mentions.users.first()
-        if (!user){
-            return msg.channel.send({content:"**There is no user to add:**\nuse: `"+config.prefix+"add <user>`"})
-        }
+        if (!user) return msg.channel.send({embeds:[bot.errorLog.invalidArgsMessage("Missing Argument `<user>`:\n`"+config.prefix+"add <user>`")]})
 
         if (!msg.member.permissions.has("MANAGE_CHANNELS") && !msg.member.permissions.has("ADMINISTRATOR")){
-            return msg.channel.send({content:"You have no permissions to add someone to the channel!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
+            return msg.channel.send({embeds:[bot.errorLog.noPermsMessage]})
         }
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                msg.channel.send({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
 
             msg.channel.permissionOverwrites.create(user.id, { VIEW_CHANNEL:true, ADD_REACTIONS:true,ATTACH_FILES:true, EMBED_LINKS:true, SEND_MESSAGES:true})
-            msg.channel.send({content:"Added "+user.tag+" to the ticket"})
+            msg.channel.send({embeds:[bot.errorLog.success("User Added!",user.tag+" is added to this ticket")]})
             if (config.logs){console.log("[system] added user to ticket (name:"+user.username+",ticket:"+msg.channel.name+")")}
 
             var loguser = msg.mentions.users.first()
@@ -37,23 +32,21 @@ module.exports = () => {
         if (!interaction.isCommand()) return
         if (interaction.commandName != "add") return
         const user = interaction.options.getUser("user")
-        const member = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
 
-        if (!member.permissions.has("MANAGE_CHANNELS") && !member.permissions.has("ADMINISTRATOR")){
-            return interaction.reply({content:"You have no permissions to add someone to the channel!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
-        }
+        const permsmember = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
+            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false && permsmember.permissions.has("ADMINISTRATOR")){
+                interaction.reply({embeds:[bot.errorLog.noPermsMessage]})
+                return
+            }
 
 
         interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                interaction.reply({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
 
             interaction.channel.permissionOverwrites.create(user.id, { VIEW_CHANNEL:true, ADD_REACTIONS:true,ATTACH_FILES:true, EMBED_LINKS:true, SEND_MESSAGES:true})
-            interaction.reply({content:"Added "+user.tag+" to the ticket"})
+            interaction.reply({embeds:[bot.errorLog.success("User Added!",user.tag+" is added to this ticket")]})
             if (config.logs){console.log("[system] added user to ticket (name:"+user.username+",ticket:"+interaction.channel.name+")")}
 
             var loguser = user

commands/close.js

@@ -11,10 +11,7 @@ module.exports = () => {
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                msg.channel.send({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
             
             const closebutton = new discord.MessageActionRow()
             .addComponents([
@@ -25,7 +22,7 @@ module.exports = () => {
                     .setEmoji("🔒")
             ])
 
-            msg.channel.send({content:"**Click on the button below to close this ticket!**",components:[closebutton]})
+            msg.channel.send({embeds:[bot.errorLog.success("Close this ticket!","You can close this ticket by clicking on the button below!")],components:[closebutton]})
 
             console.log("[system] closed a ticket via command")
             
@@ -41,10 +38,7 @@ module.exports = () => {
        interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                interaction.reply({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
             
             const closebutton = new discord.MessageActionRow()
             .addComponents([
@@ -55,7 +49,7 @@ module.exports = () => {
                     .setEmoji("🔒")
             ])
 
-            interaction.reply({content:"**Click on the button below to close this ticket!**",components:[closebutton]})
+            interaction.reply({embeds:[bot.errorLog.success("Close this ticket!","You can close this ticket by clicking on the button below!")],components:[closebutton]})
 
             console.log("[system] closed a ticket via command")
             

commands/delete.js

@@ -11,10 +11,7 @@ module.exports = () => {
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                msg.channel.send({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
             
             const closebutton = new discord.MessageActionRow()
             .addComponents([
@@ -25,7 +22,7 @@ module.exports = () => {
                     .setEmoji("❌")
             ])
 
-            msg.channel.send({content:"**Click on the button below to delete this ticket!**",components:[closebutton]})
+            msg.channel.send({embeds:[bot.errorLog.success("Delete this ticket!","You can delete this ticket by clicking on the button below!")],components:[closebutton]})
 
             console.log("[system] deleted a ticket via command")
             
@@ -41,10 +38,7 @@ module.exports = () => {
        interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                interaction.reply({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
             
             const closebutton = new discord.MessageActionRow()
             .addComponents([
@@ -55,7 +49,7 @@ module.exports = () => {
                     .setEmoji("❌")
             ])
 
-            interaction.reply({content:"**Click on the button below to delete this ticket!**",components:[closebutton]})
+            interaction.reply({embeds:[bot.errorLog.success("Delete this ticket!","You can delete this ticket by clicking on the button below!")],components:[closebutton]})
 
             console.log("[system] deleted a ticket via command")
             

commands/remove.js

@@ -7,24 +7,19 @@ module.exports = () => {
     client.on("messageCreate",msg => {
         if (!msg.content.startsWith(config.prefix+"remove")) return
         var user = msg.mentions.users.first()
-        if (!user){
-            return msg.channel.send({content:"**There is no user to remove:**\nuse: `"+config.prefix+"remove <user>`"})
-        }
+        if (!user) return msg.channel.send({embeds:[bot.errorLog.invalidArgsMessage("Missing Argument `<user>`:\n`"+config.prefix+"remove <user>`")]})
 
         if (!msg.member.permissions.has("MANAGE_CHANNELS") && !msg.member.permissions.has("ADMINISTRATOR")){
-            return msg.channel.send({content:"You have no permissions to remove someone from the channel!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
+            return msg.channel.send({embeds:[bot.errorLog.noPermsMessage]})
         }
 
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                msg.channel.send({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
 
             msg.channel.permissionOverwrites.delete(user.id)
-            msg.channel.send({content:"Deleted "+user.tag+" from the ticket"})
+            msg.channel.send({embeds:[bot.errorLog.success("User removed!",user.tag+" is removed from this ticket")]})
             if (config.logs){console.log("[system] deleted user from ticket (name:"+user.username+",ticket:"+msg.channel.name+")")}
 
             var loguser = msg.mentions.users.first()
@@ -37,23 +32,22 @@ module.exports = () => {
         if (!interaction.isCommand()) return
         if (interaction.commandName != "remove") return
         const user = interaction.options.getUser("user")
-        const member = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
 
-        if (!member.permissions.has("MANAGE_CHANNELS") && !member.permissions.has("ADMINISTRATOR")){
-            return interaction.reply({content:"You have no permissions to remove someone from the channel!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
-        }
+        const permsmember = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
+            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false && permsmember.permissions.has("ADMINISTRATOR")){
+                interaction.reply({embeds:[bot.errorLog.noPermsMessage]})
+                return
+            }
+        
 
 
         interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                interaction.reply({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return interaction.reply({embeds:[bot.errorLog.notInATicket]})
 
             interaction.channel.permissionOverwrites.delete(user.id)
-            interaction.reply({content:"Deleted "+user.tag+" from the ticket"})
+            interaction.reply({embeds:[bot.errorLog.success("User removed!",user.tag+" is removed from this ticket")]})
             if (config.logs){console.log("[system] removed user from ticket (name:"+user.username+",ticket:"+interaction.channel.name+")")}
 
             var loguser = user

commands/rename.js

@@ -10,17 +10,17 @@ module.exports = () => {
         msg.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                msg.channel.send({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id) return msg.channel.send({embeds:[bot.errorLog.notInATicket]})
             
 
             if (!msg.member.permissions.has("MANAGE_CHANNELS") && !msg.member.permissions.has("ADMINISTRATOR")){
-                return msg.channel.send({content:"You have no permissions to change the channel name!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
+                return msg.channel.send({embeds:[bot.errorLog.noPermsMessage]})
             }
             
             var newname = msg.content.split(config.prefix+"rename")[1].substring(1)
+
+            if (!newname) return msg.channel.send({embeds:[bot.errorLog.invalidArgsMessage("Missing Argument `<name>`:\n`"+config.prefix+"rename <name>`")]})
+
             var name = msg.channel.name
             var prefix = ""
             const tickets = config.options
@@ -33,7 +33,7 @@ module.exports = () => {
             if (!prefix) prefix = "noprefix-"
 
             msg.channel.setName(prefix+newname)
-            msg.channel.send({content:"**The name is changed!**\nWarning: you can only change the channel name 2 times per minute! (this is due discord rate limits)"})
+            msg.channel.send({embeds:[bot.errorLog.success("The name has changed!","Warning: you can only change the channel name 2 times per minute!\n(this is due discord rate limits)")]})
 
             console.log("[system] renamed a ticket via command")
             
@@ -49,14 +49,12 @@ module.exports = () => {
         interaction.channel.messages.fetchPinned().then(msglist => {
             var firstmsg = msglist.last()
 
-            if (firstmsg == undefined || firstmsg.author.id != client.user.id){
-                interaction.reply({content:"You are not in a ticket!"})
-                return
-            }
+            if (firstmsg == undefined || firstmsg.author.id != client.user.id)return interaction.reply({embeds:[bot.errorLog.notInATicket]})
             
-            const member = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
-            if (!member.permissions.has("MANAGE_CHANNELS") && !member.permissions.has("ADMINISTRATOR")){
-                return interaction.reply({content:"You have no permissions to change the channel name!\nYou need the `ADMINISTRATOR` or `MANAGE_CHANNELS` permission"})
+            const permsmember = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
+            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false && permsmember.permissions.has("ADMINISTRATOR")){
+                interaction.reply({embeds:[bot.errorLog.noPermsMessage]})
+                return
             }
             
             var newname = interaction.options.getString("name")
@@ -72,7 +70,7 @@ module.exports = () => {
             if (!prefix) prefix = "noprefix-"
 
             interaction.channel.setName(prefix+newname)
-            interaction.reply({content:"**The name is changed!**\nWarning: you can only change the channel name 2 times per minute! (this is due discord rate limits)"})
+            interaction.reply({embeds:[bot.errorLog.success("The name has changed!","Warning: you can only change the channel name 2 times per minute!\n(this is due discord rate limits)")]})
 
             console.log("[system] renamed a ticket via command")
             

commands/ticket.js

@@ -18,14 +18,14 @@ module.exports = () => {
     client.on("messageCreate", msg => {
         if (msg.content.startsWith(config.prefix+"msg")){
             if (config.main_adminroles.some((item)=>{return msg.member.roles.cache.has(item)}) == false){
-                msg.channel.send({content:"You have no permission to run this command!"})
+                msg.channel.send({embeds:[bot.errorLog.noPermsMessage]})
                 return
             }
 
             const id = msg.content.split(config.prefix+"msg")[1].substring(1) ? msg.content.split(config.prefix+"msg")[1].substring(1) : false
 
-            if (!id) return msg.channel.send({content:"**There is no id!**\nUse: `"+config.prefix+"msg <id>`"})
-            if (!msgIds.includes(id)) return msg.channel.send({content:"**Invalid id!**\nChoose from this list:\n_"+msgIds.join("_\n_")+"_"})
+            if (!id) return msg.channel.send({embeds:[bot.errorLog.invalidArgsMessage("Missing Argument `<id>`:\n`"+config.prefix+"msg <id>`")]})
+            if (!msgIds.includes(id)) return msg.channel.send({embeds:[bot.errorLog.invalidIdChooseFromList(msgIds)]})
 
 
             const {embed,componentRows} = require("../core/ticketMessageEmbed").createEmbed(id)
@@ -41,14 +41,15 @@ module.exports = () => {
         if (!interaction.isCommand()) return
         if (interaction.commandName != "message") return
 
-            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false){
-                interaction.reply({content:"You have no permission to run this command!"})
+            const permsmember = client.guilds.cache.find(g => g.id == interaction.guild.id).members.cache.find(m => m.id == interaction.member.id)
+            if (config.main_adminroles.some((item)=>{return interaction.guild.members.cache.find((m) => m.id == interaction.member.id).roles.cache.has(item)}) == false && permsmember.permissions.has("ADMINISTRATOR")){
+                interaction.reply({embeds:[bot.errorLog.noPermsMessage]})
                 return
             }
 
             const id = interaction.options.getString("id")
 
-            if (!msgIds.includes(id)) return interaction.reply({content:"**Invalid id!**\nChoose from this list:\n_"+msgIds.join("_\n_")+"_"})
+            if (!msgIds.includes(id)) return interaction.reply({embeds:[bot.errorLog.invalidIdChooseFromList(msgIds)]})
 
             const {embed,componentRows} = require("../core/ticketMessageEmbed").createEmbed(id)