diff --git a/commands/Administration/addemoji.js b/commands/Administration/addemoji.js index de37c90a..0a5dcdb1 100644 --- a/commands/Administration/addemoji.js +++ b/commands/Administration/addemoji.js @@ -26,8 +26,12 @@ class Addemoji extends Command { message.guild.emojis .create(URL, name) - .then(emoji => message.success("administration/addemoji:SUCCESS", { emojiName: `<:${emoji.name}:${emoji.id}>` })) - .catch(() => message.error("administration/addemoji:ERROR", { emojiName: name })); + .then(emoji => message.success("administration/addemoji:SUCCESS", { + emojiName: `<:${emoji.name}:${emoji.id}>` + })) + .catch(() => message.error("administration/addemoji:ERROR", { + emojiName: name + })); } }; diff --git a/commands/Administration/backup.js b/commands/Administration/backup.js index a28f6f83..791ef1f9 100644 --- a/commands/Administration/backup.js +++ b/commands/Administration/backup.js @@ -78,7 +78,9 @@ class Backup extends Command { backup.fetch(backupID).then(async (backupInfos) => { const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("administration/backup:TITLE_INFO") }) + .setAuthor({ + name: message.translate("administration/backup:TITLE_INFO") + }) // Display the backup ID .addField(message.translate("administration/backup:TITLE_ID"), backupInfos.id, true) // Displays the server from which this backup comes @@ -88,8 +90,35 @@ class Backup extends Command { // Display when the backup was created .addField(message.translate("administration/backup:TITLE_CREATED_AT"), message.printDate(new Date(backupInfos.data.createdTimestamp)), true) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); - message.channel.send({ embeds: [embed] }); + .setFooter({ + text: data.config.embed.footer + }); + message.channel.send({ + embeds: [embed] + }); + }).catch(() => { + // if the backup wasn't found + return message.error("administration/backup:NO_BACKUP_FOUND", { + backupID + }); + }); + } else if (status === "remove") { + const backupID = args[1]; + if (!backupID) return message.error("administration/backup:MISSING_BACKUP_ID"); + + backup.fetch(backupID).then(async () => { + message.sendT("administration/backup:CONFIRMATION"); + await message.channel.awaitMessages(m => (m.author.id === message.author.id) && (m.content === "confirm"), { + max: 1, + time: 20000, + errors: ["time"] + }).catch(() => { + // if the author of the commands does not confirm the backup loading + return message.error("administration/backup:TIMES_UP"); + }); + + backup.remove(backupID); + message.success("administration/backup:SUCCESS_REMOVED"); }).catch(() => { // if the backup wasn't found return message.error("administration/backup:NO_BACKUP_FOUND", { diff --git a/commands/Administration/configuration.js b/commands/Administration/configuration.js index 81660d0f..11520f47 100644 --- a/commands/Administration/configuration.js +++ b/commands/Administration/configuration.js @@ -21,9 +21,14 @@ class Configuration extends Command { const guildData = data.guild; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.guild.name, iconURL: message.guild.iconURL() }) + .setAuthor({ + name: message.guild.name, + iconURL: message.guild.iconURL() + }) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); // Guild prefix embed.addField(message.translate("administration/configuration:PREFIX_TITLE"), guildData.prefix); @@ -85,7 +90,9 @@ class Configuration extends Command { // Dashboard link embed.addField(message.translate("administration/configuration:DASHBOARD_TITLE"), `[${message.translate("administration/configuration:DASHBOARD_CONTENT")}](${this.client.config.dashboard.baseURL})`); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Administration/goodbye.js b/commands/Administration/goodbye.js index 5072e673..f026bb2b 100644 --- a/commands/Administration/goodbye.js +++ b/commands/Administration/goodbye.js @@ -50,7 +50,8 @@ class Goodbye extends Command { }); const filter = m => m.author.id === message.author.id; - const collector = message.channel.createMessageCollector({ filter, + const collector = message.channel.createMessageCollector({ + filter, time: 120000 // 2 minutes }); diff --git a/commands/Administration/setfortniteshop.js b/commands/Administration/setfortniteshop.js index 49a067bb..33b462d8 100644 --- a/commands/Administration/setfortniteshop.js +++ b/commands/Administration/setfortniteshop.js @@ -65,7 +65,9 @@ class Setfortniteshop extends Command { }) .setImage("attachment://shop.png") .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); const msg = await channel.send({ embeds: [embed], files: [attachment] diff --git a/commands/Administration/welcome.js b/commands/Administration/welcome.js index 2c68060b..a1fae0d5 100644 --- a/commands/Administration/welcome.js +++ b/commands/Administration/welcome.js @@ -50,7 +50,8 @@ class Welcome extends Command { }); const filter = m => m.author.id === message.author.id; - const collector = message.channel.createMessageCollector({ filter, + const collector = message.channel.createMessageCollector({ + filter, time: 120000 // 2 minutes }); diff --git a/commands/Economy/achievements.js b/commands/Economy/achievements.js index c38d9298..663d822e 100644 --- a/commands/Economy/achievements.js +++ b/commands/Economy/achievements.js @@ -19,9 +19,13 @@ class Achievements extends Command { async run(message, args, data) { const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("economy/achievements:TITLE") }) + .setAuthor({ + name: message.translate("economy/achievements:TITLE") + }) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); embed.addField(message.translate("economy/achievements:SEND_CMD"), message.translate("economy/achievements:PROGRESS", { now: data.userData.achievements.firstCommand.progress.now, @@ -59,7 +63,9 @@ class Achievements extends Command { percent: Math.round(100 * (data.userData.achievements.invite.progress.now / data.userData.achievements.invite.progress.total)) })); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Economy/deposit.js b/commands/Economy/deposit.js index ecf3b399..dafec604 100644 --- a/commands/Economy/deposit.js +++ b/commands/Economy/deposit.js @@ -28,9 +28,7 @@ class Deposit extends Command { amount = parseInt(amount, 10); }; - if (data.memberData.money < amount) return message.error("economy/deposit:NOT_ENOUGH_CREDIT", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); + if (data.memberData.money < amount) return message.error("economy/deposit:NOT_ENOUGH_CREDIT", { money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` }); data.memberData.money = data.memberData.money - amount; data.memberData.bankSold = data.memberData.bankSold + amount; diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js index 8f22f0a0..298786d8 100644 --- a/commands/Economy/leaderboard.js +++ b/commands/Economy/leaderboard.js @@ -37,7 +37,9 @@ class Leaderboard extends Command { table.setHeading("#", message.translate("common:USER"), message.translate("common:CREDITS")); if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; const newTable = await fetchUsers(membersLeaderboard, table, this.client); - message.channel.send({ content: `\`\`\`\n${newTable.toString()}\`\`\`` }); + message.channel.send({ + content: `\`\`\`\n${newTable.toString()}\`\`\`` + }); } else if (type === "level") { const members = await this.client.membersData.find({ guildID: message.guild.id @@ -52,9 +54,15 @@ class Leaderboard extends Command { table.setHeading("#", message.translate("common:USER"), message.translate("common:LEVEL")); if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; const newTable = await fetchUsers(membersLeaderboard, table, this.client); - message.channel.send({ content: `\`\`\`\n${newTable.toString()}\`\`\`` }); + message.channel.send({ + content: `\`\`\`\n${newTable.toString()}\`\`\`` + }); } else if (type === "rep") { - const users = await this.client.usersData.find({ rep: { $gt: 0 } }).lean(), + const users = await this.client.usersData.find({ + rep: { + $gt: 0 + } + }).lean(), usersLeaderboard = users.map((u) => { return { id: u.id, @@ -65,7 +73,9 @@ class Leaderboard extends Command { table.setHeading("#", message.translate("common:USER"), message.translate("common:POINTS")); if (usersLeaderboard.length > 20) usersLeaderboard.length = 20; const newTable = await fetchUsers(usersLeaderboard, table, this.client); - message.channel.send({ content: `\`\`\`\n${newTable.toString()}\`\`\`` }); + message.channel.send({ + content: `\`\`\`\n${newTable.toString()}\`\`\`` + }); }; if (isOnlyOnMobile) message.sendT("economy/leaderboard:MOBILE"); diff --git a/commands/Economy/money.js b/commands/Economy/money.js index 81016c0d..db88c74f 100644 --- a/commands/Economy/money.js +++ b/commands/Economy/money.js @@ -61,7 +61,9 @@ class Credits extends Command { .addField(message.translate("economy/profile:BANK"), `**${memberData.bankSold}** ${message.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true) .addField(message.translate("economy/profile:GLOBAL"), `**${globalMoney}** ${message.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); message.channel.send({ embeds: [embed] }); diff --git a/commands/Economy/profile.js b/commands/Economy/profile.js index a3925bda..86fcce5a 100644 --- a/commands/Economy/profile.js +++ b/commands/Economy/profile.js @@ -52,13 +52,16 @@ class Profile extends Command { }); const profileEmbed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("economy/profile:TITLE", { - username: member.user.tag - }), iconURL: member.user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: message.translate("economy/profile:TITLE", { + username: member.user.tag + }), + iconURL: member.user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setImage("attachment://achievements.png") .addField(message.translate("economy/profile:BIO"), userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO")) .addField(message.translate("economy/profile:CASH"), `**${memberData.money}** ${message.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true) @@ -74,10 +77,15 @@ class Profile extends Command { prefix: data.guild.prefix })) .setColor(data.config.embed.color) // Sets the color of the embed - .setFooter({ text: data.config.embed.footer }) // Sets the footer of the embed + .setFooter({ + text: data.config.embed.footer + }) // Sets the footer of the embed .setTimestamp(); - message.channel.send({ embeds: [profileEmbed], files: [userData.getAchievements()] }); // Send the embed in the current channel + message.channel.send({ + embeds: [profileEmbed], + files: [userData.getAchievements()] + }); // Send the embed in the current channel } }; diff --git a/commands/Economy/rob.js b/commands/Economy/rob.js index c2645ba1..0822be45 100644 --- a/commands/Economy/rob.js +++ b/commands/Economy/rob.js @@ -19,7 +19,6 @@ class Rob extends Command { async run(message, args, data) { const member = await this.client.resolveMember(args[0], message.guild); if (!member) return message.error("economy/rob:MISSING_MEMBER"); - if (member.id === message.author.id) return message.error("economy/rob:YOURSELF"); const memberData = await this.client.findOrCreateMember({ @@ -28,21 +27,15 @@ class Rob extends Command { }); const isInCooldown = memberData.cooldowns.rob || 0; if (isInCooldown) { - if (isInCooldown > Date.now()) return message.error("economy/rob:COOLDOWN", { - username: member.user.tag - }); + if (isInCooldown > Date.now()) return message.error("economy/rob:COOLDOWN", { username: member.user.tag }); }; let amountToRob = args[1]; - if (!amountToRob || isNaN(amountToRob) || parseInt(amountToRob, 10) <= 0) return message.error("economy/rob:MISSING_AMOUNT", { - username: member.user.username - }); + if (!amountToRob || isNaN(amountToRob) || parseInt(amountToRob, 10) <= 0) return message.error("economy/rob:MISSING_AMOUNT", { username: member.user.username }); amountToRob = Math.floor(parseInt(amountToRob, 10)); - if (amountToRob > memberData.money) return message.error("economy/rob:NOT_ENOUGH_MEMBER", { - username: member.user.username - }); + if (amountToRob > memberData.money) return message.error("economy/rob:NOT_ENOUGH_MEMBER", { username: member.user.username }); const potentiallyLose = Math.floor(amountToRob * 1.5); if (potentiallyLose > data.memberData.money) return message.error("economy/rob:NOT_ENOUGH_AUTHOR", { diff --git a/commands/Economy/slots.js b/commands/Economy/slots.js index 3c29e5ff..73b4ab6f 100644 --- a/commands/Economy/slots.js +++ b/commands/Economy/slots.js @@ -19,15 +19,9 @@ class Slots extends Command { async run(message, args, data) { const fruits = ["🍎", "🍐", "🍌", "🍇", "🍉", "🍒", "🍓"]; - let i1 = 0, - j1 = 0, - k1 = 0, - i2 = 1, - j2 = 1, - k2 = 1, - i3 = 2, - j3 = 2, - k3 = 2; + let i1 = 0, j1 = 0, k1 = 0, + i2 = 1, j2 = 1, k2 = 1, + i3 = 2, j3 = 2, k3 = 2; // Gets three random fruits array const colonnes = [ @@ -39,9 +33,7 @@ class Slots extends Command { // Gets the amount provided let amount = args[0]; if (!amount || isNaN(amount) || amount < 1) amount = 50; - if (amount > data.memberData.money) return message.error("economy/slots:NOT_ENOUGH", { - money: `${amount} ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); + if (amount > data.memberData.money) return message.error("economy/slots:NOT_ENOUGH", { money: `${amount} ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` }); amount = Math.round(amount); diff --git a/commands/Economy/withdraw.js b/commands/Economy/withdraw.js index 327a3a28..77560414 100644 --- a/commands/Economy/withdraw.js +++ b/commands/Economy/withdraw.js @@ -28,9 +28,7 @@ class Withdraw extends Command { amount = parseInt(amount, 10); }; - if (data.memberData.bankSold < amount) return message.error("economy/withdraw:NOT_ENOUGH", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); + if (data.memberData.bankSold < amount) return message.error("economy/withdraw:NOT_ENOUGH", { money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` }); data.memberData.money = data.memberData.money + amount; data.memberData.bankSold = data.memberData.bankSold - amount; diff --git a/commands/Economy/work.js b/commands/Economy/work.js index d72fdaaf..48f18842 100644 --- a/commands/Economy/work.js +++ b/commands/Economy/work.js @@ -40,11 +40,14 @@ class Work extends Command { await data.memberData.save(); const embed = new Discord.MessageEmbed() - .setFooter({ text: message.translate("economy/work:AWARD"), iconURL: message.author.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setFooter({ + text: message.translate("economy/work:AWARD"), + iconURL: message.author.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setColor(data.config.embed.color); const award = [ diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js index d39e711a..e5d69b37 100644 --- a/commands/Fun/8ball.js +++ b/commands/Fun/8ball.js @@ -22,7 +22,9 @@ class Eightball extends Command { const answerN = this.client.functions.randomNum(1, 19); const answer = message.translate(`fun/8ball:RESPONSE_${answerN + 1}`); - message.channel.send({ content: answer }); + message.channel.send({ + content: answer + }); } }; diff --git a/commands/Fun/ascii.js b/commands/Fun/ascii.js index 020fab6a..232e260f 100644 --- a/commands/Fun/ascii.js +++ b/commands/Fun/ascii.js @@ -25,7 +25,9 @@ class Ascii extends Command { const rendered = await figletAsync(text); - message.channel.send({ content: "```" + rendered + "```" }); + message.channel.send({ + content: "```" + rendered + "```" + }); } }; diff --git a/commands/Fun/choice.js b/commands/Fun/choice.js index 02166b4a..28cac91e 100644 --- a/commands/Fun/choice.js +++ b/commands/Fun/choice.js @@ -29,7 +29,9 @@ class Choice extends Command { edit: true }); const result = answers[parseInt(Math.floor(Math.random() * answers.length))]; - message.channel.send({ content: "```" + result + "```" }); + message.channel.send({ + content: "```" + result + "```" + }); }, 1500); } }; diff --git a/commands/Fun/fml.js b/commands/Fun/fml.js index f80d4d37..b02b92f9 100644 --- a/commands/Fun/fml.js +++ b/commands/Fun/fml.js @@ -25,10 +25,14 @@ class Fml extends Command { const embed = new Discord.MessageEmbed() .setDescription(fml.content) - .setFooter({ text: message.translate("fun/fml:FOOTER") }) + .setFooter({ + text: message.translate("fun/fml:FOOTER") + }) .setColor(data.config.embed.color); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Fun/joke.js b/commands/Fun/joke.js index e1d993fa..b2ca3017 100644 --- a/commands/Fun/joke.js +++ b/commands/Fun/joke.js @@ -25,10 +25,14 @@ class Joke extends Command { const embed = new Discord.MessageEmbed() .setDescription(joke.toDiscordSpoils()) - .setFooter({ text: message.translate("fun/joke:FOOTER") }) + .setFooter({ + text: message.translate("fun/joke:FOOTER") + }) .setColor(data.config.embed.color); - message.channel.send({embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Fun/lmg.js b/commands/Fun/lmg.js index ad193aea..167f5942 100644 --- a/commands/Fun/lmg.js +++ b/commands/Fun/lmg.js @@ -20,7 +20,9 @@ class Lmg extends Command { const question = args.join(" "); if (!question) return message.error("fun/lmg:MISSING"); const encodedQuestion = question.replace(/[' '_]/g, "+"); - await message.channel.send({ content: `https://google.gik-team.com/?q=${encodedQuestion}` }); + await message.channel.send({ + content: `https://google.gik-team.com/?q=${encodedQuestion}` + }); message.delete().catch(() => {}); } }; diff --git a/commands/Fun/lovecalc.js b/commands/Fun/lovecalc.js index 6f394ab4..593067ca 100644 --- a/commands/Fun/lovecalc.js +++ b/commands/Fun/lovecalc.js @@ -37,16 +37,22 @@ class Lovecalc extends Command { const percent = parseInt(string.substr(0, 2), 10); const embed = new Discord.MessageEmbed() - .setAuthor({ name: `❤️ ${message.translate("fun/lovecalc:DESCRIPTION")}` }) + .setAuthor({ + name: `❤️ ${message.translate("fun/lovecalc:DESCRIPTION")}` + }) .setDescription(message.translate("fun/lovecalc:CONTENT", { percent, firstUsername: firstMember.user.username, secondUsername: secondMember.user.username })) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/activity.js b/commands/General/activity.js index e19bb3c3..94e48854 100644 --- a/commands/General/activity.js +++ b/commands/General/activity.js @@ -34,9 +34,13 @@ class Activity extends Command { .setTitle("Awkword") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Awkword", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -46,9 +50,13 @@ class Activity extends Command { .setTitle("Betrayal.io") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Betrayal.io", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -58,9 +66,13 @@ class Activity extends Command { .setTitle("Checkers In The Park") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Checkers In The Park", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -70,9 +82,13 @@ class Activity extends Command { .setTitle("Chess In The Park") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Chess In The Park", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -82,9 +98,13 @@ class Activity extends Command { .setTitle("Doodle Crew") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Doodle Crew", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -94,9 +114,13 @@ class Activity extends Command { .setTitle("Fishington.io") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Fishington.io", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -106,9 +130,13 @@ class Activity extends Command { .setTitle("Letter Tile") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Letter Tile", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -118,9 +146,13 @@ class Activity extends Command { .setTitle("Poker Night") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Poker Night", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -130,9 +162,13 @@ class Activity extends Command { .setTitle("Spell Cast") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Spell Cast", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -142,9 +178,13 @@ class Activity extends Command { .setTitle("Words Snack") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Words Snack", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -154,9 +194,13 @@ class Activity extends Command { .setTitle("Puttparty") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Puttparty", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -166,9 +210,13 @@ class Activity extends Command { .setTitle("Youtube Together") .setColor(data.config.embed.color) .setDescription(`**[${message.translate("misc:CLICK_HERE", { activity: "Youtube Together", channel: voice.name })}](${invite.code})**`) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }); break; @@ -177,9 +225,13 @@ class Activity extends Command { .setTitle(message.translate("general/activity:TITLE")) .setDescription(activities.join("\n")) .setColor(data.config.embed.color) - .setFooter({ text: message.translate("general/activity:FOOTER") }) + .setFooter({ + text: message.translate("general/activity:FOOTER") + }) .setTimestamp() - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); break; }; } diff --git a/commands/General/fortnite.js b/commands/General/fortnite.js index 83f7b177..76a191fd 100644 --- a/commands/General/fortnite.js +++ b/commands/General/fortnite.js @@ -67,8 +67,13 @@ class Fortnite extends Command { })) .setImage("attachment://fortnite-stats-image.png") .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); - message.channel.send({ embeds: [embed], files: [attachment] }); + .setFooter({ + text: data.config.embed.footer + }); + message.channel.send({ + embeds: [embed], + files: [attachment] + }); m.delete(); } }; diff --git a/commands/General/fortniteshop.js b/commands/General/fortniteshop.js index 2b083c06..9e2195bb 100644 --- a/commands/General/fortniteshop.js +++ b/commands/General/fortniteshop.js @@ -41,17 +41,25 @@ class Fortniteshop extends Command { const attachment = new Discord.MessageAttachment(image, "shop.png"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/fortniteshop:HEADER", { - date: message.printDate(new Date(Date.now())) - }), iconURL: this.client.user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: message.translate("general/fortniteshop:HEADER", { + date: message.printDate(new Date(Date.now())) + }), + iconURL: this.client.user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setImage("attachment://shop.png") .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); - await message.channel.send({ embeds: [embed], files: [attachment] }); + .setFooter({ + text: data.config.embed.footer + }); + await message.channel.send({ + embeds: [embed], + files: [attachment] + }); await m.delete(); return; } diff --git a/commands/General/github.js b/commands/General/github.js index 4eb0b4cb..e135d31a 100644 --- a/commands/General/github.js +++ b/commands/General/github.js @@ -23,12 +23,14 @@ class Github extends Command { const json = await res.json(); const embed = new Discord.MessageEmbed() - .setAuthor({ name: this.client.user.tag, iconURL: this.client.user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" + .setAuthor({ + name: this.client.user.tag, + iconURL: this.client.user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) }) - }) .setDescription(`[${message.translate("general/github:CLICK_HERE")}](${json.html_url})`) .addField("Название", json.name, true) .addField("Звёзды", json.stargazers_count, true) @@ -37,9 +39,13 @@ class Github extends Command { .addField(message.translate("general/github:OWNER"), `[${json.owner.login}](${json.owner.html_url})`) .setImage(json.owner.avatar_url) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/hastebin.js b/commands/General/hastebin.js index 9d246bb6..a6f8518d 100644 --- a/commands/General/hastebin.js +++ b/commands/General/hastebin.js @@ -37,10 +37,14 @@ class Hastebin extends Command { const url = `https://hastebin.com/${json.key}.js`; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/hastebin:SUCCESS") }) + .setAuthor({ + name: message.translate("general/hastebin:SUCCESS") + }) .setDescription(url) .setColor(data.config.embed.color); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } catch (e) { message.error("misc:ERR_OCCURRED"); }; diff --git a/commands/General/help.js b/commands/General/help.js index a65acb59..81a5f0d6 100644 --- a/commands/General/help.js +++ b/commands/General/help.js @@ -41,16 +41,24 @@ class Help extends Command { }); const groupEmbed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/help:CMD_TITLE", { cmd: cmd.help.name }) }) + .setAuthor({ + name: message.translate("general/help:CMD_TITLE", { + cmd: cmd.help.name + }) + }) .addField(message.translate("general/help:FIELD_DESCRIPTION"), description) .addField(message.translate("general/help:FIELD_USAGE"), usage) .addField(message.translate("general/help:FIELD_EXAMPLES"), examples) .addField(message.translate("general/help:FIELD_ALIASES"), cmd.help.aliases.length > 0 ? cmd.help.aliases.map(a => "`" + a + "`").join("\n") : message.translate("general/help:NO_ALIAS")) .addField(message.translate("general/help:FIELD_PERMISSIONS"), cmd.conf.memberPermissions.length > 0 ? cmd.conf.memberPermissions.map((p) => `\`${p}\``).join("\n") : message.translate("general/help:NO_REQUIRED_PERMISSION")) .setColor(this.client.config.embed.color) - .setFooter({ text: this.client.config.embed.footer }); + .setFooter({ + text: this.client.config.embed.footer + }); - return message.channel.send({ embeds: [groupEmbed] }); + return message.channel.send({ + embeds: [groupEmbed] + }); }; const categories = []; @@ -70,11 +78,14 @@ class Help extends Command { prefix: message.guild ? data.guild.prefix : "" })) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); categories.sort().forEach((cat) => { const tCommands = commands.filter((cmd) => cmd.help.category === cat); embed.addField(`${emojis.categories[cat.toLowerCase()]} ${cat} - (${tCommands.size})`, `${tCommands.map((cmd) => `${cmd.help.name}`).join(", ")}`); }); + if (message.guild) { if (data.guild.customCommands.length > 0) embed.addField(`${emojis.categories.custom} ${message.guild.name} | ${message.translate("general/help:CUSTOM_COMMANDS")} - (${data.guild.customCommands.length})`, data.guild.customCommands.map((cmd) => `\`${cmd.name}\``).join(", ")); }; @@ -85,14 +96,20 @@ class Help extends Command { donateLink: "https://qiwi.com/n/JONNYBRO/", owner: this.client.config.owner.id })); - embed.setAuthor({ name: message.translate("general/help:TITLE", { - name: this.client.user.username - }), iconURL: this.client.user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}); - return message.channel.send({ embeds: [embed] }); + embed.setAuthor({ + name: message.translate("general/help:TITLE", { + name: this.client.user.username + }), + iconURL: this.client.user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }); + + return message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/invitations.js b/commands/General/invitations.js index b7428068..f29ed0f2 100644 --- a/commands/General/invitations.js +++ b/commands/General/invitations.js @@ -48,8 +48,12 @@ class Invitations extends Command { const embed = new Discord.MessageEmbed() .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) - .setAuthor({ name: message.translate("general/invitations:TRACKER") }) + .setFooter({ + text: data.config.embed.footer + }) + .setAuthor({ + name: message.translate("general/invitations:TRACKER") + }) .setDescription(message.translate("general/invitations:TITLE", { member: member.user.tag, guild: message.guild.name @@ -59,7 +63,9 @@ class Invitations extends Command { })) .addField(message.translate("general/invitations:FIELD_CODES"), content); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/invite.js b/commands/General/invite.js index 05b2cd65..14608be4 100644 --- a/commands/General/invite.js +++ b/commands/General/invite.js @@ -18,14 +18,21 @@ class Invite extends Command { } async run(message, args, data) { - const inviteLink = this.client.generateInvite({ scopes: ["bot"] , permissions: [Discord.Permissions.FLAGS.ADMINISTRATOR] }); + const inviteLink = this.client.generateInvite({ + scopes: ["bot"], + permissions: [Discord.Permissions.FLAGS.ADMINISTRATOR] + }); const voteURL = `https://discordbots.org/bot/${this.client.user.id}/vote`; const supportURL = await this.client.functions.supportLink(this.client); - if (args[0] && args[0] === "copy") return message.channel.send({ content: inviteLink }); + if (args[0] && args[0] === "copy") return message.channel.send({ + content: inviteLink + }); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/invite:LINKS") }) + .setAuthor({ + name: message.translate("general/invite:LINKS") + }) .setDescription(message.translate("general/invite:TIP", { prefix: data.guild.prefix || "" })) @@ -33,9 +40,13 @@ class Invite extends Command { .addField(message.translate("general/invite:VOTE"), voteURL) .addField(message.translate("general/invite:SUPPORT"), supportURL) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/minecraft.js b/commands/General/minecraft.js index 8e0db356..17134ea4 100644 --- a/commands/General/minecraft.js +++ b/commands/General/minecraft.js @@ -66,10 +66,11 @@ class Minecraft extends Command { const imgAttachment = new Discord.MessageAttachment(await imgRes.buffer(), "success.png"); const mcEmbed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/minecraft:FIELD_NAME", { - ip: json.name + .setAuthor({ + name: message.translate("general/minecraft:FIELD_NAME", { + ip: json.name + }) }) - }) .addField(message.translate("general/minecraft:FIELD_VERSION"), json.raw.vanilla.raw.version.name) .addField(message.translate("general/minecraft:FIELD_CONNECTED"), message.translate("general/minecraft:PLAYERS", { count: (json.raw.players ? json.raw.players.online : json.players.length) @@ -81,9 +82,15 @@ class Minecraft extends Command { .addField(message.translate("general/minecraft:FIELD_IP"), json.connect) .setColor(data.config.embed.color) .setThumbnail(favicon) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - m.edit({ content: null, embeds: [mcEmbed], files: [imgAttachment] }); + m.edit({ + content: null, + embeds: [mcEmbed], + files: [imgAttachment] + }); } }; diff --git a/commands/General/permissions.js b/commands/General/permissions.js index 21bed371..c79a6773 100644 --- a/commands/General/permissions.js +++ b/commands/General/permissions.js @@ -37,7 +37,9 @@ class Permissions extends Command { }; }); text += `\n${total.allowed} ✅ | ${total.denied} ❌` + "\n```"; - message.channel.send({ content: text }); + message.channel.send({ + content: text + }); } }; diff --git a/commands/General/quote.js b/commands/General/quote.js index a1da0eb2..57f88980 100644 --- a/commands/General/quote.js +++ b/commands/General/quote.js @@ -20,14 +20,19 @@ class Quote extends Command { async run(message, args, data) { function embed(m) { const embed = new Discord.MessageEmbed() - .setAuthor({ name: m.author.tag, iconURL: m.author.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: m.author.tag, + iconURL: m.author.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setDescription(m.content) .setColor(m.member ? m.member.roles.highest ? m.member.roles.highest.color : data.config.embed.color : data.config.embed.color) - .setFooter({ text: m.guild.name + " | #" + m.channel.name }) + .setFooter({ + text: m.guild.name + " | #" + m.channel.name + }) .setTimestamp(m.createdTimestamp); if (m.attachments.size > 0) embed.setImage(m.attachments.first().url); return embed; @@ -35,7 +40,9 @@ class Quote extends Command { const msgID = args[0]; if (isNaN(msgID)) { - message.author.send({ content: message.translate("general/quote:MISSING_ID") }).then(() => { + message.author.send({ + content: message.translate("general/quote:MISSING_ID") + }).then(() => { message.delete(); }).catch(() => { message.error("misc:CANNOT_DM"); @@ -66,7 +73,9 @@ class Quote extends Command { return; }).then((msg) => { message.delete(); - message.channel.send({ embeds: [embed(msg)] }); + message.channel.send({ + embeds: [embed(msg)] + }); }); } else { channel.messages.fetch(msgID).catch(() => { @@ -78,7 +87,9 @@ class Quote extends Command { return; }).then((msg) => { message.delete(); - message.channel.send({ embeds: [embed(msg)] }); + message.channel.send({ + embeds: [embed(msg)] + }); }); }; } diff --git a/commands/General/report.js b/commands/General/report.js index 3c82927c..91fff91c 100644 --- a/commands/General/report.js +++ b/commands/General/report.js @@ -29,24 +29,31 @@ class Report extends Command { if (!rep) return message.error("general/report:MISSING_REASON"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/report:TITLE", { - user: member.user.tag - }), iconURL: message.author.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: message.translate("general/report:TITLE", { + user: member.user.tag + }), + iconURL: message.author.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .addField(message.translate("common:AUTHOR"), message.author.tag, true) .addField(message.translate("common:DATE"), message.printDate(new Date(Date.now())), true) .addField(message.translate("common:REASON"), rep, true) .addField(message.translate("common:USER"), `\`${member.user.tag}\` (${member.user.toString()})`, true) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); const success = Discord.Util.parseEmoji(this.client.customEmojis.success).id; const error = Discord.Util.parseEmoji(this.client.customEmojis.error).id; - repChannel.send({ embeds: [embed] }).then(async (m) => { + repChannel.send({ + embeds: [embed] + }).then(async (m) => { await m.react(success); await m.react(error); }); diff --git a/commands/General/serverinfo.js b/commands/General/serverinfo.js index 0e2d8624..c065ec80 100644 --- a/commands/General/serverinfo.js +++ b/commands/General/serverinfo.js @@ -31,9 +31,12 @@ class Serverinfo extends Command { await guild.members.fetch(); const embed = new Discord.MessageEmbed() - .setAuthor({ name: guild.name, iconURL: guild.iconURL({ - dynamic: true - })}) + .setAuthor({ + name: guild.name, + iconURL: guild.iconURL({ + dynamic: true + }) + }) .setThumbnail(guild.iconURL({ dynamic: true })) @@ -53,9 +56,13 @@ class Serverinfo extends Command { "\n" + `${guild.channels.cache.filter(c => c.type === "GUILD_CATEGORY").size} ${message.getNoun(guild.channels.cache.filter(c => c.type === "GUILD_CATEGORY").size, message.translate("misc:NOUNS:CATEGORY:1"), message.translate("misc:NOUNS:CATEGORY:2"), message.translate("misc:NOUNS:CATEGORY:5"))}`, true ) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/shorturl.js b/commands/General/shorturl.js index 9adc92cb..c6016d8c 100644 --- a/commands/General/shorturl.js +++ b/commands/General/shorturl.js @@ -29,9 +29,13 @@ class ShortURL extends Command { const embed = new Discord.MessageEmbed() .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setDescription(body); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/someone.js b/commands/General/someone.js index 48f8a098..d35cfc50 100644 --- a/commands/General/someone.js +++ b/commands/General/someone.js @@ -30,7 +30,9 @@ class Someone extends Command { format: "png" })) .setColor(data.config.embed.color); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/staff.js b/commands/General/staff.js index 90499df0..6d223034 100644 --- a/commands/General/staff.js +++ b/commands/General/staff.js @@ -22,14 +22,20 @@ class Staff extends Command { const administrators = message.guild.members.cache.filter((m) => m.permissions.has(Discord.Permissions.FLAGS.ADMINISTRATOR) && !m.user.bot); const moderators = message.guild.members.cache.filter((m) => !administrators.has(m.id) && m.permissions.has(Discord.Permissions.FLAGS.MANAGE_MESSAGES) && !m.user.bot); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/staff:TITLE", { - guild: message.guild.name - })}) + .setAuthor({ + name: message.translate("general/staff:TITLE", { + guild: message.guild.name + }) + }) .addField(message.translate("general/staff:ADMINS"), (administrators.size > 0 ? administrators.map((a) => `${this.client.customEmojis.status[a.presence.status]} | <@${a.user.id}>`).join("\n") : message.translate("general/staff:NO_ADMINS"))) .addField(message.translate("general/staff:MODS"), (moderators.size > 0 ? moderators.map((m) => `${this.client.customEmojis.status[m.presence.status]} | <@${m.user.id}>`).join("\n") : message.translate("general/staff:NO_MODS"))) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); - message.channel.send({ embeds: [embed] }); + .setFooter({ + text: data.config.embed.footer + }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/General/stats.js b/commands/General/stats.js index c2ba55c7..0b2b2391 100644 --- a/commands/General/stats.js +++ b/commands/General/stats.js @@ -20,8 +20,12 @@ class Stats extends Command { async run(message, args, data) { const statsEmbed = new Discord.MessageEmbed() .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) - .setAuthor({ name: message.translate("common:STATS") }) + .setFooter({ + text: data.config.embed.footer + }) + .setAuthor({ + name: message.translate("common:STATS") + }) .setDescription(message.translate("general/stats:MADE")) .addField(this.client.customEmojis.stats + " " + message.translate("general/stats:COUNTS_TITLE"), message.translate("general/stats:COUNTS_CONTENT", { servers: this.client.guilds.cache.size, @@ -46,7 +50,9 @@ class Stats extends Command { donateLink: "https://qiwi.com/n/JONNYBRO/", owner: this.client.config.owner.id })); - message.channel.send({ embeds: [statsEmbed] }); + message.channel.send({ + embeds: [statsEmbed] + }); } }; diff --git a/commands/General/suggest.js b/commands/General/suggest.js index 6f8ff958..d1431229 100644 --- a/commands/General/suggest.js +++ b/commands/General/suggest.js @@ -25,23 +25,30 @@ class Suggest extends Command { if (!sugg) return message.error("general/suggest:MISSING_CONTENT"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("general/suggest:TITLE", { - user: message.author.username - }), iconURL: message.author.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: message.translate("general/suggest:TITLE", { + user: message.author.username + }), + iconURL: message.author.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .addField(message.translate("common:AUTHOR"), `\`${message.author.username}#${message.author.discriminator}\``, true) .addField(message.translate("common:DATE"), message.printDate(new Date(Date.now())), true) .addField(message.translate("common:CONTENT"), sugg) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); const success = Discord.Util.parseEmoji(this.client.customEmojis.success).id; const error = Discord.Util.parseEmoji(this.client.customEmojis.error).id; - suggChannel.send({ embeds: [embed] }).then(async (m) => { + suggChannel.send({ + embeds: [embed] + }).then(async (m) => { await m.react(success); await m.react(error); }); diff --git a/commands/General/translate.js b/commands/General/translate.js index a757bbcb..14741661 100644 --- a/commands/General/translate.js +++ b/commands/General/translate.js @@ -44,20 +44,23 @@ class Translate extends Command { if (!langs.includes(language)) return pWait.error("general/translate:INVALID_LANGUAGE", { prefix: data.guild.prefix, search: language }, { edit: true }); - const translated = await translate(toTranslate, { - to: language - }); + const translated = await translate(toTranslate, { to: language }); const resEmbed = new Discord.MessageEmbed() - .setAuthor({ name: "Переводчик", iconURL: this.client.user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: "Переводчик", + iconURL: this.client.user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .addField(translated.from.language.iso, "```" + toTranslate + "```") .addField(language, "```" + translated.text + "```") .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); return pWait.edit({ content: null, diff --git a/commands/General/userinfo.js b/commands/General/userinfo.js index d1c09b7d..97dbae07 100644 --- a/commands/General/userinfo.js +++ b/commands/General/userinfo.js @@ -41,11 +41,14 @@ class Userinfo extends Command { if (message.guild) member = await message.guild.members.fetch(user).catch(() => {}); const embed = new Discord.MessageEmbed() - .setAuthor({ name: user.tag, iconURL: user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: user.tag, + iconURL: user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setThumbnail(user.displayAvatarURL({ dynamic: true })) @@ -59,15 +62,17 @@ class Userinfo extends Command { format: "png" })) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); if (displayPresence) { - embed.addField(this.client.customEmojis.games + " " + message.translate("common:GAME"), (user.presence.activity ? user.presence.activity.name : message.translate("general/userinfo:NO_GAME")), true) - embed.addField(this.client.customEmojis.status[user.presence.status] + " " + message.translate("common:STATUS"), message.translate("common:STATUS_" + (user.presence.status.toUpperCase())), true); + embed.addField(this.client.customEmojis.games + " " + message.translate("common:GAME"), (member.presence.activities[0] ? `${member.presence.activities[0].name}\n${member.presence.activities[0].details}\n${member.presence.activities[0].state}` : message.translate("general/userinfo:NO_GAME")), true) + embed.addField(this.client.customEmojis.status[member.presence.status] + " " + message.translate("common:STATUS"), message.translate("common:STATUS_" + (member.presence.status.toUpperCase())), true); }; if (member) { - embed.addField(this.client.customEmojis.up + " " + message.translate("general/userinfo:ROLE"), (member.roles.highest ? member.roles.highest : message.translate("general/userinfo:NO_ROLE")), true) + // embed.addField(this.client.customEmojis.up + " " + message.translate("general/userinfo:ROLE"), (member.roles.highest ? member.roles.highest : message.translate("general/userinfo:NO_ROLE")), true) embed.addField(this.client.customEmojis.calendar2 + " " + message.translate("common:JOIN"), message.printDate(member.joinedAt), true) embed.addField(this.client.customEmojis.color + " " + message.translate("common:COLOR"), member.displayHexColor, true) embed.addField(this.client.customEmojis.pencil + " " + message.translate("common:NICKNAME"), (member.nickname ? member.nickname : message.translate("general/userinfo:NO_NICKNAME")), true) @@ -95,7 +100,9 @@ class Userinfo extends Command { }; }; - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Moderation/announcement.js b/commands/Moderation/announcement.js index a14997aa..653258c2 100644 --- a/commands/Moderation/announcement.js +++ b/commands/Moderation/announcement.js @@ -75,13 +75,20 @@ class Announcement extends Command { if (reason === "time") return message.error("misc:TIMES_UP"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("moderation/announcement:TITLE") }) + .setAuthor({ + name: message.translate("moderation/announcement:TITLE") + }) .setColor(data.config.embed.color) - .setFooter({ text: message.author.tag }) + .setFooter({ + text: message.author.tag + }) .setTimestamp() .setDescription(text); - message.channel.send({ content: mention, embeds: [embed] }); + message.channel.send({ + content: mention, + embeds: [embed] + }); }); } }; diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js index 71835d4a..b6569234 100644 --- a/commands/Moderation/ban.js +++ b/commands/Moderation/ban.js @@ -86,14 +86,18 @@ class Ban extends Command { const channel = message.guild.channels.cache.get(data.guild.plugins.modlogs); if (!channel) return; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("moderation/ban:CASE", { - count: data.guild.casesCount - })}) + .setAuthor({ + name: message.translate("moderation/ban:CASE", { + count: data.guild.casesCount + }) + }) .addField(message.translate("common:USER"), `\`${user.tag}\` (${user.toString()})`, true) .addField(message.translate("common:MODERATOR"), `\`${message.author.tag}\` (${message.author.toString()})`, true) .addField(message.translate("common:REASON"), reason, true) .setColor("#e02316"); - channel.send({ embeds: [embed] }); + channel.send({ + embeds: [embed] + }); }; }).catch((err) => { diff --git a/commands/Moderation/checkinvites.js b/commands/Moderation/checkinvites.js index 52382781..a1c12535 100644 --- a/commands/Moderation/checkinvites.js +++ b/commands/Moderation/checkinvites.js @@ -20,7 +20,7 @@ class Checkinvites extends Command { async run(message, args, data) { const withInvite = []; message.guild.members.cache.forEach((m) => { - const possibleLinks = m.user.presence.activities.map((a) => [a.state, a.details, a.name]).flat(); + const possibleLinks = m.presence.activities.map((a) => [a.state, a.details, a.name]).flat(); const inviteLinks = possibleLinks.filter((l) => /(discord\.(gg|io|me|li)\/.+|discordapp\.com\/invite\/.+)/i.test(l)); if (inviteLinks.length > 0) { withInvite.push({ @@ -36,9 +36,13 @@ class Checkinvites extends Command { const embed = new Discord.MessageEmbed() .setDescription(text) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - const m = await message.channel.send({ embeds: [embed] }); + const m = await message.channel.send({ + embeds: [embed] + }); setTimeout(function () { m.delete(); diff --git a/commands/Moderation/clear.js b/commands/Moderation/clear.js index 6b98bbaa..08ad4e6d 100644 --- a/commands/Moderation/clear.js +++ b/commands/Moderation/clear.js @@ -30,7 +30,9 @@ class Clear extends Command { const newChannel = await message.channel.clone(); await message.channel.delete(); newChannel.setPosition(position); - return newChannel.send({ content: message.translate("moderation/clear:CHANNEL_CLEARED") }); + return newChannel.send({ + content: message.translate("moderation/clear:CHANNEL_CLEARED") + }); }; let amount = args[0]; diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js index 09ecbee4..7a48b9e1 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -73,14 +73,18 @@ class Kick extends Command { const channel = message.guild.channels.cache.get(data.guild.plugins.modlogs); if (!channel) return; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("moderation/kick:CASE", { - count: data.guild.casesCount - })}) + .setAuthor({ + name: message.translate("moderation/kick:CASE", { + count: data.guild.casesCount + }) + }) .addField(message.translate("common:USER"), `\`${member.user.tag}\` (${member.user.toString()})`, true) .addField(message.translate("common:MODERATOR"), `\`${message.author.tag}\` (${message.author.toString()})`, true) .addField(message.translate("common:REASON"), reason, true) .setColor("#e88709"); - channel.send({ embeds: [embed] }); + channel.send({ + embeds: [embed] + }); }; }).catch(() => { diff --git a/commands/Moderation/mute.js b/commands/Moderation/mute.js index 10cae1ee..535b7de0 100644 --- a/commands/Moderation/mute.js +++ b/commands/Moderation/mute.js @@ -90,16 +90,20 @@ class Mute extends Command { const channel = message.guild.channels.cache.get(data.guild.plugins.modlogs); if (!channel) return; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("moderation/mute:CASE", { - count: data.guild.casesCount - })}) + .setAuthor({ + name: message.translate("moderation/mute:CASE", { + count: data.guild.casesCount + }) + }) .addField(message.translate("common:USER"), `\`${member.user.tag}\` (${member.user.toString()})`, true) .addField(message.translate("common:MODERATOR"), `\`${message.author.tag}\` (${message.author.toString()})`, true) .addField(message.translate("common:REASON"), reason, true) .addField(message.translate("common:DURATION"), time, true) .addField(message.translate("common:EXPIRY"), message.printDate(new Date(Date.now() + ms(time))), true) .setColor("#f44271"); - channel.send({ embeds: [embed] }); + channel.send({ + embeds: [embed] + }); } } }; diff --git a/commands/Moderation/poll.js b/commands/Moderation/poll.js index 05680b7a..69e5122e 100644 --- a/commands/Moderation/poll.js +++ b/commands/Moderation/poll.js @@ -83,14 +83,19 @@ class Poll extends Command { ]; const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("moderation/poll:TITLE") }) + .setAuthor({ + name: message.translate("moderation/poll:TITLE") + }) .setColor(data.config.embed.color) .addField(question, message.translate("moderation/poll:REACT", { success: emojis[0].toString(), error: emojis[1].toString() })); - message.channel.send({ content: mention, embeds: [embed] }).then(async (m) => { + message.channel.send({ + content: mention, + embeds: [embed] + }).then(async (m) => { await m.react(emojis[0]); await m.react(emojis[1]); }); diff --git a/commands/Moderation/sanctions.js b/commands/Moderation/sanctions.js index c7384053..f14cb88a 100644 --- a/commands/Moderation/sanctions.js +++ b/commands/Moderation/sanctions.js @@ -27,25 +27,34 @@ class Sanctions extends Command { }); const embed = new Discord.MessageEmbed() - .setAuthor({ name: user.tag, iconURL: user.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: user.tag, + iconURL: user.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); if (memberData.sanctions.length < 1) { embed.setDescription(message.translate("moderation/sanctions:NO_SANCTION", { username: user.tag })); - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); } else { memberData.sanctions.forEach((s) => { embed.addField(s.type + " | #" + s.case, `${message.translate("common:MODERATOR")}: <@${s.moderator}>\n${message.translate("common:REASON")}: ${s.reason}`, true); }); }; - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js index 8fd54257..3a570f65 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -67,9 +67,11 @@ class Warn extends Command { reason })); caseInfo.type = "ban"; - embed.setAuthor({ name: message.translate("moderation/ban:CASE", { - count: data.guild.casesCount - })}) + embed.setAuthor({ + name: message.translate("moderation/ban:CASE", { + count: data.guild.casesCount + }) + }) .setColor("#e02316"); message.guild.members.ban(member).catch(() => {}); message.success("moderation/setwarns:AUTO_BAN", { @@ -88,9 +90,11 @@ class Warn extends Command { reason })); caseInfo.type = "kick"; - embed.setAuthor({ name: message.translate("moderation/kick:CASE", { - count: data.guild.casesCount - })}) + embed.setAuthor({ + name: message.translate("moderation/kick:CASE", { + count: data.guild.casesCount + }) + }) .setColor("#e88709"); member.kick().catch(() => {}); message.success("moderation/setwarns:AUTO_KICK", { @@ -107,9 +111,11 @@ class Warn extends Command { reason })); caseInfo.type = "warn"; - embed.setAuthor({ name: message.translate("moderation/warn:CASE", { - caseNumber: data.guild.casesCount - })}) + embed.setAuthor({ + name: message.translate("moderation/warn:CASE", { + caseNumber: data.guild.casesCount + }) + }) .setColor("#8c14e2"); message.success("moderation/warn:WARNED", { username: member.user.tag, @@ -122,7 +128,9 @@ class Warn extends Command { if (data.guild.plugins.modlogs) { const channel = message.guild.channels.cache.get(data.guild.plugins.modlogs); if (!channel) return; - channel.send({ embeds: [embed] }); + channel.send({ + embeds: [embed] + }); }; } }; diff --git a/commands/Music/back.js b/commands/Music/back.js index faefa06d..b2e24f4a 100644 --- a/commands/Music/back.js +++ b/commands/Music/back.js @@ -26,16 +26,24 @@ class Back extends Command { if (!queue.previousSongs[0]) return message.error("music/back:NO_PREV_SONG"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/back:DESCRIPTION") }) + .setAuthor({ + name: message.translate("music/back:DESCRIPTION") + }) .setThumbnail(queue.tracks[0].thumbnail) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); - const m = await message.channel.send({ embeds: [embed] }); + const m = await message.channel.send({ + embeds: [embed] + }); this.client.player.previous(message); embed.setDescription(message.translate("music/back:SUCCESS")); - m.edit({ embeds: [embed] }); + m.edit({ + embeds: [embed] + }); } }; diff --git a/commands/Music/clips.js b/commands/Music/clips.js index 026d0a74..d482a88c 100644 --- a/commands/Music/clips.js +++ b/commands/Music/clips.js @@ -32,9 +32,13 @@ class Clips extends Command { .setTitle(message.translate("music/clips:EMBED_TITLE")) .setDescription(clips.join("\n")) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setTimestamp(); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); }); } }; diff --git a/commands/Music/filters.js b/commands/Music/filters.js index 7689da0b..88771944 100644 --- a/commands/Music/filters.js +++ b/commands/Music/filters.js @@ -39,7 +39,9 @@ class Filters extends Command { .addField("** **", filtersStatuses[1].join("\n"), true) .setColor(data.config.embed.color); - message.channel.send({ embeds: [list] }); + message.channel.send({ + embeds: [list] + }); } }; diff --git a/commands/Music/jump.js b/commands/Music/jump.js index 07cd1f83..7d986a38 100644 --- a/commands/Music/jump.js +++ b/commands/Music/jump.js @@ -27,18 +27,26 @@ class Jump extends Command { if (number < 0) return message.error("music/jump:NO_PREV_SONG", { prefix: data.guild.prefix }); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/jump:SUCCESS") }) + .setAuthor({ + name: message.translate("music/jump:SUCCESS") + }) .setThumbnail(queue.songs[number].thumbnail) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setColor(data.config.embed.color); - const m = await message.channel.send({ embeds: [embed] }); + const m = await message.channel.send({ + embeds: [embed] + }); this.client.player.jump(message, number); embed.setDescription(message.translate("music/play:NOW_PLAYING", { songName: queue.songs[number].name })); - m.edit({ embeds: [embed] }); + m.edit({ + embeds: [embed] + }); } }; diff --git a/commands/Music/lyrics.js b/commands/Music/lyrics.js index ad715f12..e1381e34 100644 --- a/commands/Music/lyrics.js +++ b/commands/Music/lyrics.js @@ -27,7 +27,9 @@ class Lyrics extends Command { songName })) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }); + .setFooter({ + text: data.config.embed.footer + }); try { const songNameFormated = songName @@ -46,7 +48,9 @@ class Lyrics extends Command { }; embed.setDescription(lyrics); - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } catch (e) { console.log(e); diff --git a/commands/Music/np.js b/commands/Music/np.js index 66f3be76..90995562 100644 --- a/commands/Music/np.js +++ b/commands/Music/np.js @@ -29,17 +29,23 @@ class Np extends Command { // Generate discord embed to display song informations const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/queue:TITLE") }) + .setAuthor({ + name: message.translate("music/queue:TITLE") + }) .setThumbnail(track.thumbnail) .addField(message.translate("music/np:T_TITLE"), `[${track.name}](${track.url})`) .addField(message.translate("music/np:T_CHANNEL"), track.uploader.name ? track.uploader.name : "Отсутствует") .addField(message.translate("music/np:T_DURATION"), `${queue.formattedCurrentTime} / ${track.formattedDuration}`) .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setTimestamp(); // Send the embed in the current channel - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Music/queue.js b/commands/Music/queue.js index 2fa1634a..5da5dc81 100644 --- a/commands/Music/queue.js +++ b/commands/Music/queue.js @@ -27,21 +27,29 @@ class Queue extends Command { if (queue.songs.length === 1) { const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/queue:TITLE"), iconURL: message.guild.iconURL({ - dynamic: true - })}) + .setAuthor({ + name: message.translate("music/queue:TITLE"), + iconURL: message.guild.iconURL({ + dynamic: true + }) + }) .addField(message.translate("music/np:CURRENTLY_PLAYING"), `[${queue.songs[0].name}](${queue.songs[0].url})\n*Добавил ${queue.songs[0].member}*\n`) .setColor(data.config.embed.color); - return message.channel.send({ embeds: [embed] }); + return message.channel.send({ + embeds: [embed] + }); }; const FieldsEmbed = new Pagination.FieldsEmbed(); FieldsEmbed.embed .setColor(data.config.embed.color) - .setAuthor({ name: message.translate("music/queue:TITLE"), iconURL: message.guild.iconURL({ - dynamic: true - })}) + .setAuthor({ + name: message.translate("music/queue:TITLE"), + iconURL: message.guild.iconURL({ + dynamic: true + }) + }) .addField(message.translate("music/np:CURRENTLY_PLAYING"), `[${queue.songs[0].name}](${queue.songs[0].url})\n*Добавил ${queue.songs[0].member}*\n`); FieldsEmbed.setArray(queue.songs[1] ? queue.songs.slice(1, queue.songs.length) : []) diff --git a/commands/Music/seek.js b/commands/Music/seek.js index c6e65c31..350ce767 100644 --- a/commands/Music/seek.js +++ b/commands/Music/seek.js @@ -20,11 +20,10 @@ class Seek extends Command { async run(message, args) { const voice = message.member.voice.channel; const queue = this.client.player.getQueue(message); + const time = ms(args[0]); if (!voice) return message.error("music/play:NO_VOICE_CHANNEL"); if (!queue) return message.error("music/play:NOT_PLAYING"); - - const time = ms(args[0]); if (isNaN(time)) return message.error("music/seek:INVALID_TIME"); await this.client.player.seek(message, time); diff --git a/commands/Music/skip.js b/commands/Music/skip.js index 9bbfbc02..8dc74dcc 100644 --- a/commands/Music/skip.js +++ b/commands/Music/skip.js @@ -26,18 +26,26 @@ class Skip extends Command { if (!queue.songs[1]) return message.error("music/skip:NO_NEXT_SONG"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/skip:SUCCESS") }) + .setAuthor({ + name: message.translate("music/skip:SUCCESS") + }) .setThumbnail(queue.songs[1].thumbnail) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setColor(data.config.embed.color); - const m = await message.channel.send({ embeds: [embed] }); + const m = await message.channel.send({ + embeds: [embed] + }); this.client.player.skip(message); embed.setDescription(message.translate("music/play:NOW_PLAYING", { songName: queue.songs[1].name })); - m.edit({ embeds: [embed] }); + m.edit({ + embeds: [embed] + }); } }; diff --git a/commands/Music/stop.js b/commands/Music/stop.js index ecc5985a..2a70d12a 100644 --- a/commands/Music/stop.js +++ b/commands/Music/stop.js @@ -25,15 +25,23 @@ class Stop extends Command { if (!queue) return message.error("music/play:NOT_PLAYING"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.translate("music/stop:DESCRIPTION") }) - .setFooter({ text: data.config.embed.footer }) + .setAuthor({ + name: message.translate("music/stop:DESCRIPTION") + }) + .setFooter({ + text: data.config.embed.footer + }) .setColor(data.config.embed.color); - const m = await message.channel.send({ embeds: [embed] }); + const m = await message.channel.send({ + embeds: [embed] + }); this.client.player.stop(message); embed.setDescription(message.translate("music/stop:SUCCESS")); - m.edit({ embeds: [embed] }); + m.edit({ + embeds: [embed] + }); } }; diff --git a/commands/NSFW/hentai.js b/commands/NSFW/hentai.js index eb2cd9ab..0921efa7 100644 --- a/commands/NSFW/hentai.js +++ b/commands/NSFW/hentai.js @@ -23,7 +23,9 @@ class Hentai extends Command { var gif = null; const embed = new Discord.MessageEmbed() .setColor(data.config.embed.color) - .setFooter({ text: data.config.embed.footer }) + .setFooter({ + text: data.config.embed.footer + }) .setTimestamp() switch (category) { @@ -95,7 +97,9 @@ class Hentai extends Command { })) break; }; - message.channel.send({ embeds: [embed] }); + message.channel.send({ + embeds: [embed] + }); } }; diff --git a/commands/Owner/eval.js b/commands/Owner/eval.js index ed2ebe74..4b471798 100644 --- a/commands/Owner/eval.js +++ b/commands/Owner/eval.js @@ -25,12 +25,16 @@ class Eval extends Command { depth: 0 }); if (output.includes(this.client.token)) output = output.replace(this.client.token, "T0K3N"); - message.channel.send({ content: "```js\n" + output + "```" }); + message.channel.send({ + content: "```js\n" + output + "```" + }); }).catch((err) => { console.error(err); err = err.toString(); if (err.includes(this.client.token)) err = err.replace(this.client.token, "T0K3N"); - message.channel.send({ content: "```js\n" + err + "```" }); + message.channel.send({ + content: "```js\n" + err + "```" + }); }); } }; diff --git a/commands/Owner/reload.js b/commands/Owner/reload.js index efe0948f..747f8bf8 100644 --- a/commands/Owner/reload.js +++ b/commands/Owner/reload.js @@ -20,7 +20,7 @@ class Reload extends Command { async run(message, args, data) { const command = args[0]; const cmd = this.client.commands.get(command) || this.client.commands.get(this.client.aliases.get(command)); - if (!cmd) message.error("owner/reload:NOT_FOUND", { search: command }); + if (!cmd) return message.error("owner/reload:NOT_FOUND", { search: command }); await this.client.unloadCommand(cmd.conf.location, cmd.help.name); await this.client.loadCommand(cmd.conf.location, cmd.help.name); diff --git a/commands/Owner/say.js b/commands/Owner/say.js index db90f4e1..240cb356 100644 --- a/commands/Owner/say.js +++ b/commands/Owner/say.js @@ -36,7 +36,9 @@ class Say extends Command { content: args[0], files: [attachment] }); - else saychannel.send({ content: args[0] }); + else saychannel.send({ + content: args[0] + }); }, 2000); } else if (args[2]) { const saychannel = this.client.guilds.cache.find(guild => guild.name == args[2] || guild.id == args[2]).channels.cache.find(channel => channel.name == args[1] || channel.id == args[1]); @@ -47,7 +49,9 @@ class Say extends Command { content: args[0], files: [attachment] }); - else saychannel.send({ content: args[0] }); + else saychannel.send({ + content: args[0] + }); }, 2000); } else { message.delete(); @@ -59,7 +63,9 @@ class Say extends Command { content: args[0], files: [attachment] }); - else saychannel.send({ content: args[0] }); + else saychannel.send({ + content: args[0] + }); }, 2000); }; } diff --git a/commands/Owner/servers-list.js b/commands/Owner/servers-list.js index 93f2cd4c..bebcb10e 100644 --- a/commands/Owner/servers-list.js +++ b/commands/Owner/servers-list.js @@ -31,24 +31,32 @@ class ServersList extends Command { .join("\n"); const embed = new Discord.MessageEmbed() - .setAuthor({ name: message.author.tag, iconURL: message.author.displayAvatarURL({ - size: 512, - dynamic: true, - format: "png" - })}) + .setAuthor({ + name: message.author.tag, + iconURL: message.author.displayAvatarURL({ + size: 512, + dynamic: true, + format: "png" + }) + }) .setColor(data.config.embed.color) - .setFooter({ text: this.client.user.username }) + .setFooter({ + text: this.client.user.username + }) .setTitle(`${message.translate("common:PAGE")}: ${page}/${Math.ceil(this.client.guilds.cache.size/10)}`) .setDescription(description); - const msg = await message.channel.send({ embeds: [embed] }); + const msg = await message.channel.send({ + embeds: [embed] + }); await msg.react("⬅"); await msg.react("➡"); await msg.react("❌"); const filter = (reaction, user) => user.id === message.author.id; - const collector = msg.createReactionCollector({ filter, + const collector = msg.createReactionCollector({ + filter, time: 30000 }); @@ -74,7 +82,9 @@ class ServersList extends Command { .setDescription(description); // Edit the message - msg.edit({ embeds: [embed] }); + msg.edit({ + embeds: [embed] + }); }; if (reaction._emoji.name === "➡") { @@ -98,7 +108,9 @@ class ServersList extends Command { .setDescription(description); // Edit the message - msg.edit({ embeds: [embed] }); + msg.edit({ + embeds: [embed] + }); }; if (reaction._emoji.name === "❌") return msg.delete(); diff --git a/dashboard/utils.js b/dashboard/utils.js index 7c1ae1d4..92e1b025 100644 --- a/dashboard/utils.js +++ b/dashboard/utils.js @@ -37,7 +37,7 @@ async function fetchUser(userData, client, query) { }; const user = await client.users.fetch(userData.id); const userDb = await client.findOrCreateUser({ id: user.id }, true); - const userInfos = { ...user.toJSON(), ...userDb, ...userData, ...user.presence }; + const userInfos = { ...user.toJSON(), ...userDb, ...userData }; return userInfos; }; diff --git a/dashboard/views/includes/sidebar.ejs b/dashboard/views/includes/sidebar.ejs index ae1434c8..78c02c39 100644 --- a/dashboard/views/includes/sidebar.ejs +++ b/dashboard/views/includes/sidebar.ejs @@ -9,9 +9,6 @@

<%= user.username %>

- "> - <%= translate("common:STATUS_" + user.status.toUpperCase()) %>
@@ -72,6 +69,6 @@ $(`.sidebar-menu > li > a[href="${pathname}"]`).parent().addClass("active"); $(`.sidebar-menu > li > ul > li > a[href="${window.location.pathname}"]`).parent().addClass("active"); $(`.sidebar-menu > li > a[href="/${window.location.pathname.split("/")[1]}/"]`).parent().addClass( - "active"); + "active"); }); \ No newline at end of file diff --git a/languages/ru-RU/administration/backup.json b/languages/ru-RU/administration/backup.json index cfdc3809..11bba20f 100644 --- a/languages/ru-RU/administration/backup.json +++ b/languages/ru-RU/administration/backup.json @@ -9,6 +9,8 @@ "SUCCESS_PUBLIC": "Резервная копия успешно создана! ID резервной копии был отправлен вам в ЛС!", "SUCCESS_PRIVATE": "Вот ID вашей резервной копии: `{{backupID}}`, используйте его для восстановления на другом сервере!", "CONFIRMATION": ":warning: | **Загрузка резервной копии заменит настройки текущего сервера.**\n\n:arrow_right_hook: *Отправьте `confirm` для подтверждения!*", + "REMOVE_CONFIRMATION": ":warning: | **Вы уверены что хотите удалить резервную копию? Это действие необратимо**\n\n:arrow_right_hook: *Отправьте `confirm` для подтверждения!*", + "SUCCESS_REMOVED": "Резервная копия успешно удалена!", "START_LOADING": "Загрузка резервной копии начата, подождите!", "LOAD_SUCCESS": "Резервная копия загружена!", "TITLE_INFO": "Информация о резервной копии",