v3.5.0 push 1

core/interactionHandlers/handlers/accepted/claiming.js

@@ -26,15 +26,16 @@ module.exports = () => {
         }catch{}
 
         if (!interaction.guild) return
-        if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
-            permsChecker.sendUserNoPerms(interaction.user)
-            return
-        }
 
         const hiddendata = bot.hiddenData.readHiddenData(interaction.channel.id)
         if (hiddendata.length < 1) return interaction.editReply({embeds:[bot.errorLog.notInATicket]})
         const ticketId = hiddendata.find(d => d.key == "type").value
 
+        if (!permsChecker.ticket(interaction.user.id,interaction.guild.id,ticketId)){
+            permsChecker.sendUserNoPerms(interaction.user)
+            return
+        }
+
         hiddendata.push({key:"claimedby",value:interaction.user.id})
         bot.hiddenData.writeHiddenData(interaction.channel.id,hiddendata)
         storage.set("claimData",interaction.channel.id,interaction.user.id)

core/interactionHandlers/handlers/accepted/closing.js

@@ -31,8 +31,12 @@ module.exports = () => {
 
         const firstcomponents = interaction.message.components
 
+        const hiddendata = bot.hiddenData.readHiddenData(interaction.channel.id)
+        if (hiddendata.length < 1) return interaction.channel.send({embeds:[bot.errorLog.notInATicket]})
+        const ticketId = hiddendata.find(d => d.key == "type").value
+
         if (config.system.closeMode == "adminonly"){
-            if (!permissionChecker.command(interaction.user.id,interaction.guild.id)){
+            if (!permissionChecker.ticket(interaction.user.id,interaction.guild.id,ticketId)){
                 if (!permissionChecker.sendUserNoPerms(interaction.user)){
                     permissionChecker.sendChannelNoPerms(interaction.channel,interaction.user)
                 }

core/interactionHandlers/handlers/accepted/closingReason.js

@@ -56,8 +56,12 @@ module.exports = () => {
 
         const firstcomponents = interaction.message.components
 
+        const hiddendata = bot.hiddenData.readHiddenData(interaction.channel.id)
+        if (hiddendata.length < 1) return interaction.channel.send({embeds:[bot.errorLog.notInATicket]})
+        const ticketId = hiddendata.find(d => d.key == "type").value
+
         if (config.system.closeMode == "adminonly"){
-            if (!permissionChecker.command(interaction.user.id,interaction.guild.id)){
+            if (!permissionChecker.ticket(interaction.user.id,interaction.guild.id,ticketId)){
                 if (!permissionChecker.sendUserNoPerms(interaction.user)){
                     permissionChecker.sendChannelNoPerms(interaction.channel,interaction.user)
                 }

core/interactionHandlers/handlers/accepted/deleting.js

@@ -29,7 +29,11 @@ module.exports = () => {
 
         const firstcomponents = bot.buttons.close.openRowNormal
 
-        if (!permissionChecker.command(interaction.user.id,interaction.guild.id)){
+        const hiddendata = bot.hiddenData.readHiddenData(interaction.channel.id)
+        if (hiddendata.length < 1) return interaction.channel.send({embeds:[bot.errorLog.notInATicket]})
+        const ticketId = hiddendata.find(d => d.key == "type").value
+
+        if (!permissionChecker.ticket(interaction.user.id,interaction.guild.id,ticketId)){
             if (!permissionChecker.sendUserNoDelete(interaction.user)){
                 permissionChecker.sendChannelNoDelete(interaction.channel,interaction.user)
             }
@@ -69,7 +73,11 @@ module.exports = () => {
 
         const firstcomponents = bot.buttons.close.closeCommandRow
 
-        if (!permissionChecker.command(interaction.user.id,interaction.guild.id)){
+        const hiddendata = bot.hiddenData.readHiddenData(interaction.channel.id)
+        if (hiddendata.length < 1) return interaction.channel.send({embeds:[bot.errorLog.notInATicket]})
+        const ticketId = hiddendata.find(d => d.key == "type").value
+
+        if (!permissionChecker.ticket(interaction.user.id,interaction.guild.id,ticketId)){
             if (!permissionChecker.sendUserNoDelete(interaction.user)){
                 permissionChecker.sendChannelNoDelete(interaction.channel,interaction.user)
             }