fixed the last bugs & added czech translation

This commit is contained in:
DJj123dj
2022-08-14 22:13:51 +02:00
parent 0845390569
commit 6823b96114
10 changed files with 48 additions and 36 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ module.exports = () => {
if (!interaction.guild) return if (!interaction.guild) return
if (!permsChecker.command(interaction.user.id,interaction.guild.id)){ if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
permsChecker.sendUserNoPerms(interaction.user) permsChecker.sendUserNoPerms(interaction.user)
return return interaction.reply({embeds:[bot.errorLog.noPermsDelete]})
} }
interaction.channel.messages.fetchPinned().then(msglist => { interaction.channel.messages.fetchPinned().then(msglist => {
+5 -4
View File
@@ -176,15 +176,16 @@ exports.onTranscriptCreation = (messages,channel,guild,date) => {
* @param {Date} date * @param {Date} date
*/ */
exports.onCommand = (type,hasPerms,user,channel,guild,date) => { exports.onCommand = (type,hasPerms,user,channel,guild,date) => {
const newguild = guild ? guild : false
//system //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) => { commandListeners.forEach((func) => {
try { try {
func(type,hasPerms,user,channel,guild,date) func(type,hasPerms,user,channel,newguild,date)
}catch{} }catch{}
}) })
} }
/**@typedef {"add"|"remove"|"add&remove"} OTReactionRoleType */ /**@typedef {"add"|"remove"|"add&remove"} OTReactionRoleType */
@@ -273,7 +274,7 @@ exports.onCommand = (type,hasPerms,user,channel,guild,date) => {
* @param {Boolean} hasPerms * @param {Boolean} hasPerms
* @param {discord.User} user * @param {discord.User} user
* @param {discord.TextChannel} channel * @param {discord.TextChannel} channel
* @param {discord.Guild} guild * @param {discord.Guild|false} guild
* @param {Date} date * @param {Date} date
*/ */
@@ -35,7 +35,9 @@ module.exports = () => {
if (!permissionChecker.sendUserNoPerms(interaction.user)){ if (!permissionChecker.sendUserNoPerms(interaction.user)){
permissionChecker.sendChannelNoPerms(interaction.channel) permissionChecker.sendChannelNoPerms(interaction.channel)
} }
interaction.message.edit({components:firstcomponents}) interaction.message.edit({components:[firstcomponents]})
closeTicketButtonChecker = false
return
} }
} }
@@ -34,7 +34,9 @@ module.exports = () => {
if (!permissionChecker.sendUserNoDelete(interaction.user)){ if (!permissionChecker.sendUserNoDelete(interaction.user)){
permissionChecker.sendChannelNoDelete(interaction.channel) 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)]}) interaction.channel.send({embeds:[bot.embeds.commands.deleteEmbed(interaction.user)]})
await interaction.message.edit({components:[bot.buttons.close.openRowDisabled]}) await interaction.message.edit({components:[bot.buttons.close.openRowDisabled]})
console.log("hi")
await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"delete",false,true) await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"delete",false,true)
deleteTicketButtonChecker = false deleteTicketButtonChecker = false
}) })
//DELETE NO TRANSCRIPT //DELETE NO TRANSCRIPT
var deleteTicketButtonChecker = false var deleteTicketButtonChecker1 = false
client.on("interactionCreate",async interaction => { client.on("interactionCreate",async interaction => {
if (!interaction.isButton()) return if (!interaction.isButton()) return
if (interaction.customId != "OTdeleteTicketTrue1") return if (interaction.customId != "OTdeleteTicketTrue1") return
interaction.deferUpdate() interaction.deferUpdate()
if (deleteTicketButtonChecker == true) return if (deleteTicketButtonChecker1 == true) return
deleteTicketButtonChecker = true 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.command(interaction.user.id,interaction.guild.id)){
if (!permissionChecker.sendUserNoDelete(interaction.user)){ if (!permissionChecker.sendUserNoDelete(interaction.user)){
permissionChecker.sendChannelNoDelete(interaction.channel) 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)]}) interaction.channel.send({embeds:[bot.embeds.commands.deleteEmbed(interaction.user)]})
await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"deletenotranscript",false,true) await require("../../../ticketCloser").NEWcloseTicket(interaction.member,interaction.channel,prefix,"deletenotranscript",false,true)
deleteTicketButtonChecker = false deleteTicketButtonChecker1 = false
}) })
} }
@@ -38,6 +38,8 @@ module.exports = () => {
return return
} }
try {
tsmsg.edit({embeds:[bot.embeds.commands.sendTranscriptEmbed(true,interaction.channel,interaction.user)],files:[fileattachment]}) tsmsg.edit({embeds:[bot.embeds.commands.sendTranscriptEmbed(true,interaction.channel,interaction.user)],files:[fileattachment]})
}catch{}
}) })
} }
@@ -56,7 +56,7 @@ module.exports = () => {
if (interaction.customId != "OTdeleteTicket1") return if (interaction.customId != "OTdeleteTicket1") return
interaction.deferUpdate() interaction.deferUpdate()
interaction.message.edit({components:[bot.buttons.verifybars.deleteVerifyBar]}) interaction.message.edit({components:[bot.buttons.verifybars.delete1VerifyBar]})
}) })
client.on("interactionCreate",interaction => { client.on("interactionCreate",interaction => {
@@ -64,6 +64,6 @@ module.exports = () => {
if (interaction.customId != "OTdeleteTicketFalse1") return if (interaction.customId != "OTdeleteTicketFalse1") return
interaction.deferUpdate() interaction.deferUpdate()
interaction.message.edit({components:[bot.buttons.close.openRowNormal]}) interaction.message.edit({components:[bot.buttons.close.closeCommandRow]})
}) })
} }
+7 -4
View File
@@ -334,10 +334,13 @@ exports.NEWcloseTicket = async (member,channel,prefix,mode,reason,nomessage) =>
} }
if (deleteRequired){ if (deleteRequired){
const timer = () => {return new Promise((resolve,reject) => { //const timer = () => {return new Promise((resolve,reject) => {
setTimeout(() => {resolve(true)},7000) // setTimeout(() => {resolve(true)},7000)
})} //})}
await timer() //await timer()
setTimeout(async () => {
await channel.delete() await channel.delete()
},6000)
} }
} }
+1 -1
View File
@@ -35,7 +35,7 @@ const reopenTicket = (guild,channel,user) => {
}) })
channel.permissionOverwrites.cache.forEach((p) => { channel.permissionOverwrites.cache.forEach((p) => {
if (p.type == "member"){ if (p.type == 1){
permissionsArray.push({ permissionsArray.push({
id:p.id, id:p.id,
type:"member", type:"member",
+13 -13
View File
@@ -146,21 +146,21 @@ if (process.argv[2] && process.argv[2].startsWith("slash")){
}else{ }else{
//commands //commands
require('./commands/ticket')(this) require('./commands/ticket')()
require("./commands/help")(this) require("./commands/help")()
require("./commands/close")(this) require("./commands/close")()
require("./commands/delete")(this) require("./commands/delete")()
require("./commands/rename")(this) require("./commands/rename")()
require("./commands/add")(this) require("./commands/add")()
require("./commands/remove")(this) require("./commands/remove")()
require("./commands/reopen")(this) require("./commands/reopen")()
//core //core
require('./core/ticketOpener')(this) require('./core/ticketOpener')()
require("./core/ticketCloser").runThis(this) require("./core/ticketCloser").runThis()
require("./core/closebuttons")(this) //require("./core/closebuttons")() // => everything is now in ./core/interactionHandlers/
require("./core/reactionRoles")(this) require("./core/reactionRoles")()
require("./core/ticketReopener").runThis(this) require("./core/ticketReopener").runThis()
//InteractionHandlers //InteractionHandlers
require("./core/interactionHandlers/handlers/handlers")() require("./core/interactionHandlers/handlers/handlers")()
+1 -1
View File
@@ -4,7 +4,7 @@
"missingArgsDescription":"Er missen parameters", "missingArgsDescription":"Er missen parameters",
"noPermsTitle":"Geen permissies!", "noPermsTitle":"Geen permissies!",
"noPermsDescription":"Je hebt de `ADMINISTRATOR` permissie nodig of je moet in de lijst van toegestane users staan!", "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", "chooseFromListTitle":"Onjuist ID",
"chooseFromListDescription":"Kies een van de id's hier onder:", "chooseFromListDescription":"Kies een van de id's hier onder:",
"boterror":"Bot Error!", "boterror":"Bot Error!",