v3.3.1 BUG FIXES! (+ added Slovenian)

This commit is contained in:
DJj123dj
2023-03-20 20:01:09 +01:00
parent 6c213306b6
commit 69fdc7ccf0
8 changed files with 53 additions and 35 deletions
+1 -1
View File
@@ -427,7 +427,7 @@ exports.checker = async () => {
checkType(config.languageFile,"string","languagefile")
const lf = config.languageFile
if (!lf.startsWith("custom") && !lf.startsWith("english") && !lf.startsWith("dutch") && !lf.startsWith("romanian") && !lf.startsWith("german") && !lf.startsWith("arabic") && !lf.startsWith("spanish") && !lf.startsWith("portuguese") && !lf.startsWith("french") && !lf.startsWith("italian") && !lf.startsWith("czech") && !lf.startsWith("danish") && !lf.startsWith("russian") && !lf.startsWith("turkish") && !lf.startsWith("polish")){
if (!lf.startsWith("custom") && !lf.startsWith("english") && !lf.startsWith("dutch") && !lf.startsWith("romanian") && !lf.startsWith("german") && !lf.startsWith("arabic") && !lf.startsWith("spanish") && !lf.startsWith("portuguese") && !lf.startsWith("french") && !lf.startsWith("italian") && !lf.startsWith("czech") && !lf.startsWith("danish") && !lf.startsWith("russian") && !lf.startsWith("turkish") && !lf.startsWith("polish") && !lf.startsWith("slovenian")){
createError("'languagefile' | invalid language, more info in the wiki")
}
@@ -10,6 +10,7 @@ const storage = bot.storage
const hiddendata = bot.hiddenData
const embed = discord.EmbedBuilder
const mc = config.color
const permsChecker = require("../../../utils/permisssionChecker")
const button = discord.ButtonBuilder
const arb = discord.ActionRowBuilder
@@ -22,9 +23,15 @@ module.exports = () => {
if (interaction.customId != "OTclaimTicket") return
try {
interaction.deferUpdate()
await interaction.deferUpdate()
}catch{}
if (!interaction.guild) return
if (!permsChecker.command(interaction.user.id,interaction.guild.id)){
permsChecker.sendUserNoPerms(interaction.user)
return
}
interaction.channel.messages.fetchPinned().then(msglist => {
/**@type {discord.Message} */
var firstmsg = msglist.last()
@@ -40,11 +47,10 @@ module.exports = () => {
.setFooter({text:"claimed by: "+interaction.user.tag,iconURL:interaction.user.displayAvatarURL()})
.setDescription(hdraw.description+bot.hiddenData.writeHiddenData(hiddendata.type,hiddendata.data))
if (!firstmsg.components[0].components[1].disabled){
firstmsg.edit({components:[bot.buttons.firstmsg.firstmsgRowNormalNoClaim],embeds:[newEmbed]})
}else if (firstmsg.components[0].components[1].disabled){
if (firstmsg.components[0].components[1] && firstmsg.components[0].components[1].disabled){
firstmsg.edit({components:[bot.buttons.firstmsg.firstmsgRowDisabledNoClaim],embeds:[newEmbed]})
}else{
firstmsg.edit({components:[bot.buttons.firstmsg.firstmsgRowNormalNoClaim],embeds:[newEmbed]})
}
})
})
@@ -64,12 +64,12 @@ exports.compile = (guild,channel,user,messagesInv,data) => {
})
})
const memberColor = msg.member ? msg.member.displayHexColor : "#ffffff"
messagesArray.push({
author:{
name:msg.author.tag,
id:Number(msg.author.id),
color:msg.member.displayHexColor || "#ffffff",
color:memberColor,
pfp:msg.author.displayAvatarURL()
},
content:msg.content || "",
+5 -3
View File
@@ -1,5 +1,5 @@
/**@typedef {{type:String,data:[{key:String,value:String}]}} hiddenData */
/**@typedef {{type:String,data:[{key:String,value:String}],status:Boolean}} hiddenData */
/**
*
@@ -9,6 +9,7 @@
exports.readHiddenData = (messageContent) => {
//ticketdata//type:123|userid:456)
if (!messageContent.includes("[ ](OTDATA|")) return {type:"",data:[],status:false}
const rawhidden = messageContent.split("[ ](OTDATA|")[1]
const rawhidden2 = rawhidden.split("//")
@@ -29,7 +30,7 @@ exports.readHiddenData = (messageContent) => {
resultData.push({key:dataresult[0],value:dataresult[1]})
})
return {type:datatype,data:resultData}
return {type:datatype,data:resultData,status:true}
}
/**
@@ -57,8 +58,9 @@ exports.writeHiddenData = (type,data) => {
* @returns {{description:String,hiddenData:hiddenData}}
*/
exports.removeHiddenData = (description) => {
const hiddenData = this.readHiddenData(description)
if (!description.includes("[ ](OTDATA|")) return {description:description,hiddenData:[]}
const hiddenData = this.readHiddenData(description)
const splitted = description.split("[ ](OTDATA")
const original = splitted[0]