From bcd9a045596d8ddb3dedfae765a030b7ff94afe4 Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Tue, 9 Aug 2022 23:48:33 +0500 Subject: [PATCH] v4.0 --- !TO REWRITE/Economy/achievements.js | 103 ------- !TO REWRITE/Economy/birthdate.js | 50 ---- !TO REWRITE/Economy/deposit.js | 52 ---- !TO REWRITE/Economy/divorce.js | 45 --- !TO REWRITE/Economy/horserace.js | 184 ------------- !TO REWRITE/Economy/importmee6.js | 29 -- !TO REWRITE/Economy/leaderboard.js | 168 ----------- !TO REWRITE/Economy/marry.js | 134 --------- !TO REWRITE/Economy/money.js | 88 ------ !TO REWRITE/Economy/number.js | 97 ------- !TO REWRITE/Economy/pay.js | 59 ---- !TO REWRITE/Economy/profile.js | 144 ---------- !TO REWRITE/Economy/rep.js | 71 ----- !TO REWRITE/Economy/rob.js | 78 ------ !TO REWRITE/Economy/setbio.js | 30 -- !TO REWRITE/Economy/tictactoe.js | 46 ---- !TO REWRITE/Economy/transactions.js | 67 ----- !TO REWRITE/Economy/withdraw.js | 52 ---- !TO REWRITE/Economy/work.js | 129 --------- TO REWRITE/leaderboard.js | 195 +++++++++++++ {!TO REWRITE => TO REWRITE}/seek.js | 2 +- commands/Administration/automod.js | 2 +- commands/Administration/autorole.js | 14 +- commands/Administration/config.js | 4 +- commands/Administration/deletemod.js | 2 +- commands/Administration/goodbye.js | 2 +- commands/Administration/set.js | 43 ++- commands/Administration/setbirthdays.js | 2 +- commands/Administration/setlang.js | 2 +- commands/Administration/setmodlogs.js | 2 +- commands/Administration/setnews.js | 2 +- commands/Administration/setreports.js | 2 +- commands/Administration/setsuggests.js | 2 +- commands/Administration/stealemoji.js | 6 +- commands/Administration/welcome.js | 2 +- commands/Economy/achievements.js | 116 ++++++++ commands/Economy/bank.js | 92 +++++++ commands/Economy/birthdate.js | 57 ++++ commands/Economy/divorce.js | 58 ++++ commands/Economy/importmee6.js | 47 ++++ commands/Economy/marry.js | 156 +++++++++++ commands/Economy/money.js | 96 +++++++ commands/Economy/number.js | 116 ++++++++ commands/Economy/pay.js | 77 ++++++ commands/Economy/profile.js | 151 ++++++++++ commands/Economy/rep.js | 81 ++++++ commands/Economy/rob.js | 94 +++++++ commands/Economy/setbio.js | 46 ++++ {!TO REWRITE => commands}/Economy/slots.js | 133 +++++---- commands/Economy/tictactoe.js | 62 +++++ commands/Economy/transactions.js | 77 ++++++ commands/Economy/work.js | 132 +++++++++ commands/Fun/8ball.js | 2 +- commands/Fun/lmgtfy.js | 2 +- commands/Fun/lovecalc.js | 2 +- commands/Fun/memes.js | 2 +- commands/General/activity.js | 4 +- commands/General/afk.js | 2 +- commands/General/avatar.js | 2 +- commands/General/emoji.js | 4 +- commands/General/help.js | 2 +- commands/General/minecraft.js | 2 +- commands/General/ping.js | 2 +- commands/General/remindme.js | 2 +- commands/General/report.js | 2 +- commands/General/serverinfo.js | 2 +- commands/General/shorturl.js | 2 +- commands/General/staff.js | 2 +- commands/General/stats.js | 2 +- commands/General/suggest.js | 6 +- commands/General/userinfo.js | 8 +- commands/General/whois.js | 2 +- commands/Moderation/clear.js | 8 +- commands/Moderation/clearwarns.js | 2 +- commands/Moderation/giveaway.js | 2 +- commands/Moderation/poll.js | 10 +- commands/Moderation/unban.js | 2 +- commands/Moderation/warn.js | 4 +- commands/Moderation/warns.js | 2 +- commands/Music/back.js | 2 +- commands/Music/clips.js | 2 +- commands/Music/loop.js | 2 +- commands/Music/nowplaying.js | 2 +- commands/Music/play.js | 2 +- commands/Music/queue.js | 2 +- commands/Music/skip.js | 2 +- commands/Music/skipto.js | 2 +- commands/Music/stop.js | 2 +- commands/NSFW/nsfw.js | 2 +- commands/Owner/announcement.js | 7 +- commands/Owner/debug.js | 78 +++--- commands/Owner/eval.js | 8 +- commands/Owner/reload.js | 4 +- commands/Owner/say.js | 2 +- commands/Owner/servers.js | 2 +- dashboard/public/docs/updates.md | 13 + dashboard/views/manager/guild.ejs | 26 +- dashboard/views/profile.ejs | 4 +- dashboard/views/stats/guild.ejs | 2 +- dashboard/views/user.ejs | 2 +- events/CommandHandler.js | 2 +- events/MessageHandler.js | 11 +- helpers/tictactoe.js | 67 +++-- index.js | 6 +- languages/en-US/common.json | 4 +- languages/en-US/economy/profile.json | 2 +- languages/ru-RU/administration/automod.json | 11 +- languages/ru-RU/administration/autorole.json | 7 +- languages/ru-RU/administration/config.json | 8 +- languages/ru-RU/administration/deletemod.json | 4 +- languages/ru-RU/administration/goodbye.json | 6 +- languages/ru-RU/administration/ignore.json | 7 - .../ru-RU/administration/setbirthdays.json | 8 +- languages/ru-RU/administration/setlang.json | 5 +- .../ru-RU/administration/setmodlogs.json | 6 +- languages/ru-RU/administration/setnews.json | 4 +- .../ru-RU/administration/setreports.json | 6 +- .../ru-RU/administration/setsuggests.json | 6 +- .../ru-RU/administration/stealemoji.json | 4 +- languages/ru-RU/administration/welcome.json | 4 +- languages/ru-RU/common.json | 13 +- languages/ru-RU/dashboard.json | 5 - languages/ru-RU/economy/achievements.json | 8 +- languages/ru-RU/economy/bank.json | 12 + languages/ru-RU/economy/birthdate.json | 6 +- languages/ru-RU/economy/deposit.json | 9 - languages/ru-RU/economy/divorce.json | 6 +- languages/ru-RU/economy/horserace.json | 15 - languages/ru-RU/economy/importmee6.json | 5 + languages/ru-RU/economy/leaderboard.json | 11 +- languages/ru-RU/economy/marry.json | 21 +- languages/ru-RU/economy/money.json | 1 + languages/ru-RU/economy/number.json | 10 +- languages/ru-RU/economy/pay.json | 9 +- languages/ru-RU/economy/profile.json | 11 +- languages/ru-RU/economy/rep.json | 7 +- languages/ru-RU/economy/rob.json | 16 +- languages/ru-RU/economy/setbio.json | 7 +- languages/ru-RU/economy/slots.json | 10 +- languages/ru-RU/economy/tictactoe.json | 15 +- languages/ru-RU/economy/transactions.json | 3 +- languages/ru-RU/economy/withdraw.json | 9 - languages/ru-RU/economy/work.json | 6 +- languages/ru-RU/fun/8ball.json | 1 + languages/ru-RU/fun/ascii.json | 6 - languages/ru-RU/fun/lmgtfy.json | 3 +- languages/ru-RU/fun/lovecalc.json | 2 +- languages/ru-RU/fun/memes.json | 8 +- languages/ru-RU/general/activity.json | 5 +- languages/ru-RU/general/afk.json | 2 +- languages/ru-RU/general/avatar.json | 4 +- languages/ru-RU/general/emoji.json | 1 - languages/ru-RU/general/help.json | 5 +- languages/ru-RU/general/remindme.json | 4 +- languages/ru-RU/general/serverinfo.json | 2 +- languages/ru-RU/misc.json | 5 +- languages/ru-RU/moderation/clear.json | 7 +- languages/ru-RU/moderation/clearwarns.json | 5 +- languages/ru-RU/moderation/giveaway.json | 6 +- languages/ru-RU/moderation/poll.json | 4 +- languages/ru-RU/moderation/warn.json | 2 +- languages/ru-RU/moderation/warns.json | 2 +- languages/ru-RU/music/play.json | 2 +- languages/ru-RU/nsfw/nsfw.json | 5 +- languages/ru-RU/owner/announcement.json | 5 +- languages/ru-RU/owner/debug.json | 4 +- languages/ru-RU/owner/reload.json | 4 +- languages/uk-UA/common.json | 4 +- languages/uk-UA/economy/horserace.json | 15 - languages/uk-UA/economy/profile.json | 2 +- languages/uk-UA/economy/transactions.json | 1 - languages/uk-UA/general/emoji.json | 1 - package-lock.json | 260 +++++++++++++++++- package.json | 3 +- 174 files changed, 2373 insertions(+), 2153 deletions(-) delete mode 100644 !TO REWRITE/Economy/achievements.js delete mode 100644 !TO REWRITE/Economy/birthdate.js delete mode 100644 !TO REWRITE/Economy/deposit.js delete mode 100644 !TO REWRITE/Economy/divorce.js delete mode 100644 !TO REWRITE/Economy/horserace.js delete mode 100644 !TO REWRITE/Economy/importmee6.js delete mode 100644 !TO REWRITE/Economy/leaderboard.js delete mode 100644 !TO REWRITE/Economy/marry.js delete mode 100644 !TO REWRITE/Economy/money.js delete mode 100644 !TO REWRITE/Economy/number.js delete mode 100644 !TO REWRITE/Economy/pay.js delete mode 100644 !TO REWRITE/Economy/profile.js delete mode 100644 !TO REWRITE/Economy/rep.js delete mode 100644 !TO REWRITE/Economy/rob.js delete mode 100644 !TO REWRITE/Economy/setbio.js delete mode 100644 !TO REWRITE/Economy/tictactoe.js delete mode 100644 !TO REWRITE/Economy/transactions.js delete mode 100644 !TO REWRITE/Economy/withdraw.js delete mode 100644 !TO REWRITE/Economy/work.js create mode 100644 TO REWRITE/leaderboard.js rename {!TO REWRITE => TO REWRITE}/seek.js (98%) create mode 100644 commands/Economy/achievements.js create mode 100644 commands/Economy/bank.js create mode 100644 commands/Economy/birthdate.js create mode 100644 commands/Economy/divorce.js create mode 100644 commands/Economy/importmee6.js create mode 100644 commands/Economy/marry.js create mode 100644 commands/Economy/money.js create mode 100644 commands/Economy/number.js create mode 100644 commands/Economy/pay.js create mode 100644 commands/Economy/profile.js create mode 100644 commands/Economy/rep.js create mode 100644 commands/Economy/rob.js create mode 100644 commands/Economy/setbio.js rename {!TO REWRITE => commands}/Economy/slots.js (55%) create mode 100644 commands/Economy/tictactoe.js create mode 100644 commands/Economy/transactions.js create mode 100644 commands/Economy/work.js delete mode 100644 languages/ru-RU/administration/ignore.json create mode 100644 languages/ru-RU/economy/bank.json delete mode 100644 languages/ru-RU/economy/deposit.json delete mode 100644 languages/ru-RU/economy/horserace.json create mode 100644 languages/ru-RU/economy/importmee6.json delete mode 100644 languages/ru-RU/economy/withdraw.json delete mode 100644 languages/ru-RU/fun/ascii.json delete mode 100644 languages/uk-UA/economy/horserace.json diff --git a/!TO REWRITE/Economy/achievements.js b/!TO REWRITE/Economy/achievements.js deleted file mode 100644 index 1ba6ba0b..00000000 --- a/!TO REWRITE/Economy/achievements.js +++ /dev/null @@ -1,103 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -class Achievements extends Command { - constructor(client) { - super(client, { - name: "achievements", - dirname: __dirname, - enabled: true, - guildOnly: false, - aliases: ["ac"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - let member = message.guild ? message.member : message.author; - if (args[0]) member = await this.client.resolveMember(args[0], message.guild); - if (message.guild && member.user.bot) return message.error("economy/profile:BOT_USER"); - - const userData = (member.id === message.author.id ? data.userData : await this.client.findOrCreateUser({ - id: member.id - })); - - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/achievements:TITLE") - }) - .setColor(data.config.embed.color) - .setFooter({ - text: data.config.embed.footer - }); - - embed.addFields([ - { - name: message.translate("economy/achievements:SEND_CMD"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.firstCommand.progress.now, - total: userData.achievements.firstCommand.progress.total, - percent: Math.round(100 * (userData.achievements.firstCommand.progress.now / userData.achievements.firstCommand.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:CLAIM_SALARY"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.work.progress.now, - total: userData.achievements.work.progress.total, - percent: Math.round(100 * (userData.achievements.work.progress.now / userData.achievements.work.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:MARRY"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.married.progress.now, - total: userData.achievements.married.progress.total, - percent: Math.round(100 * (userData.achievements.married.progress.now / userData.achievements.married.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:SLOTS"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.slots.progress.now, - total: userData.achievements.slots.progress.total, - percent: Math.round(100 * (userData.achievements.slots.progress.now / userData.achievements.slots.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:TIP"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.tip.progress.now, - total: userData.achievements.tip.progress.total, - percent: Math.round(100 * (userData.achievements.tip.progress.now / userData.achievements.tip.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:REP"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.rep.progress.now, - total: userData.achievements.rep.progress.total, - percent: Math.round(100 * (userData.achievements.rep.progress.now / userData.achievements.rep.progress.total)) - }) - }, - { - name: message.translate("economy/achievements:INVITE"), - value: message.translate("economy/achievements:PROGRESS", { - now: userData.achievements.invite.progress.now, - total: userData.achievements.invite.progress.total, - percent: Math.round(100 * (userData.achievements.invite.progress.now / userData.achievements.invite.progress.total)) - }) - } - ]); - - message.reply({ - embeds: [embed] - }); - } -} - -module.exports = Achievements; \ No newline at end of file diff --git a/!TO REWRITE/Economy/birthdate.js b/!TO REWRITE/Economy/birthdate.js deleted file mode 100644 index 30e12059..00000000 --- a/!TO REWRITE/Economy/birthdate.js +++ /dev/null @@ -1,50 +0,0 @@ -const Command = require("../../base/Command"); - -class Birthdate extends Command { - constructor(client) { - super(client, { - name: "birthdate", - dirname: __dirname, - enabled: true, - guildOnly: false, - aliases: ["bd"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - const date = args[0]; - if (!date) return message.error("economy/birthdate:MISSING_DATE"); - - const tArgs = date.split("/"); - const [day, month, year] = tArgs; - if (!day || !month || !year) return message.error("economy/birthdate:INVALID_DATE"); - - const match = date.match(/\d+/g); - if (!match) return message.error("economy/birthdate:INVALID_DATE"); - - const tday = +match[0], - tmonth = +match[1] - 1; - let tyear = +match[2]; - - if (tyear < 100) tyear += tyear < 50 ? 2000 : 1900; - - const d = new Date(tyear, tmonth, tday); - if (!(tday == d.getDate() && tmonth == d.getMonth() && tyear == d.getFullYear())) return message.error("economy/birthdate:INVALID_DATE"); - if (d.getTime() > Date.now()) return message.error("economy/birthdate:DATE_TOO_HIGH"); - if (d.getTime() < (Date.now() - 2.523e+12)) return message.error("economy/birthdate:DATE_TOO_LOW"); - - data.userData.birthdate = d; - data.userData.save(); - - message.success("economy/birthdate:SUCCESS", { - date: this.client.printDate(d) - }); - } -} - -module.exports = Birthdate; \ No newline at end of file diff --git a/!TO REWRITE/Economy/deposit.js b/!TO REWRITE/Economy/deposit.js deleted file mode 100644 index 3cdd2547..00000000 --- a/!TO REWRITE/Economy/deposit.js +++ /dev/null @@ -1,52 +0,0 @@ -const Command = require("../../base/Command"); - -class Deposit extends Command { - constructor(client) { - super(client, { - name: "deposit", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["bank", "dep"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - let amount = args[0]; - - if (!(parseInt(data.memberData.money, 10) > 0)) return message.error("economy/deposit:NO_CREDIT"); - - if (args[0] === "all") { - amount = parseInt(data.memberData.money, 10); - } else { - if (isNaN(amount) || parseInt(amount, 10) < 1) return message.error("economy/deposit:MISSING_AMOUNT"); - 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"))}` }); - - const info = { - user: message.translate("economy/transactions:BANK"), - amount: amount, - date: Date.now(), - type: "send" - }; - - data.memberData.transactions.push(info); - - data.memberData.money = data.memberData.money - amount; - data.memberData.bankSold = data.memberData.bankSold + amount; - data.memberData.save(); - - message.success("economy/deposit:SUCCESS", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); - } -} - -module.exports = Deposit; \ No newline at end of file diff --git a/!TO REWRITE/Economy/divorce.js b/!TO REWRITE/Economy/divorce.js deleted file mode 100644 index 84aabcf4..00000000 --- a/!TO REWRITE/Economy/divorce.js +++ /dev/null @@ -1,45 +0,0 @@ -const Command = require("../../base/Command"); - -class Divorce extends Command { - constructor(client) { - super(client, { - name: "divorce", - dirname: __dirname, - enabled: true, - guildOnly: false, - aliases: ["di"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - if (!data.userData.lover) return message.error("economy/divorce:NOT_MARRIED"); - - const user = this.client.users.cache.get(data.userData.lover) || await this.client.users.fetch(data.userData.lover); - - data.userData.lover = null; - data.userData.save(); - - const oldLover = await this.client.findOrCreateUser({ - id: user.id - }); - oldLover.lover = null; - oldLover.save(); - - message.success("economy/divorce:DIVORCED", { - username: user.username - }); - - user.send({ - content: message.translate("economy/divorce:DIVORCED_U", { - username: message.author.username - }) - }); - } -} - -module.exports = Divorce; \ No newline at end of file diff --git a/!TO REWRITE/Economy/horserace.js b/!TO REWRITE/Economy/horserace.js deleted file mode 100644 index 650db328..00000000 --- a/!TO REWRITE/Economy/horserace.js +++ /dev/null @@ -1,184 +0,0 @@ -const Command = require("../../base/Command"); - -const games = {}; - -class Horserace extends Command { - constructor(client) { - super(client, { - name: "horserace", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["hr"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - if (!args[0]) return message.error("economy/horserace:MISSING_STATUS"); - const author = message.author; - - if (args[0] === "create") { - let thisGame = games[message.channel.id]; - - if (thisGame) return message.error("economy/horserace:GAME_RUNNING"); - else { - games[message.channel.id] = { - horseSpeeds: [], - bets: [] - }; - - thisGame = games[message.channel.id]; - - const f = []; - for (let i = 0; i < 5; i++) { - const speed = this.client.functions.randomNum(1, 5); - const profit = { - 1: 3.5, - 2: 3, - 3: 2.5, - 4: 2, - 5: 1.5, - }; - // const profit = Math.floor((((8.9 / 9) * (6 - speed)) + 1.1) * 10) / 10; - thisGame.horseSpeeds.push(speed); - f.push({ - name: message.translate("economy/horserace:HORSE_NAME", { - number: i + 1 - }), - value: message.translate("economy/horserace:HORSE_VALUE", { - speed, - profit: profit[speed] - }) - }); - } - message.reply({ - embeds: [{ - color: data.config.embed.color, - title: message.translate("economy/horserace:EMBED_T"), - fields: f - }] - }); - } - } else if (args[0] === "bet") { - const thisGame = games[message.channel.id]; - const horse = parseInt(args[1]); - const amount = parseInt(args[2]); - - if (horse > 5) return message.error("economy/horserace:HORSE_NUM"); - if (!thisGame) return message.error("economy/horserace:NO_GAME_RUNNING"); - - if (!amount || isNaN(amount) || parseInt(amount, 10) <= 0) return message.error("economy/pay:INVALID_AMOUNT"); - if (amount > data.memberData.money) return message.error("economy/pay:ENOUGH_MONEY", { - amount: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}` - }); - - thisGame.bets[author.id] = { - amount, - horse - }; - - message.sendT("economy/horserace:BET", { - user: author, - amount: `**${Math.floor(amount)}** ${message.getNoun(Math.floor(amount), message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}`, - horse - }); - - } else if (args[0] === "go") { - const thisGame = games[message.channel.id]; - const horsePositions = [0, 0, 0, 0, 0]; - - if (!thisGame) return message.error("economy/horserace:NO_GAME_RUNNING"); - - // eslint-disable-next-line no-constant-condition - while (true) { - for (let i = 0; i < 5; i++) { - if (thisGame.horseSpeeds[i] >= Math.floor(Math.random() * 15)) { - horsePositions[i] += 1; - if (horsePositions[i] === 3) { - const winnings = []; - - const profit = { - 1: 3.5, - 2: 3, - 3: 2.5, - 4: 2, - 5: 1.5, - }; - - // const profit = Math.floor((((8.9 / 9) * (6 - thisGame.horseSpeeds[i])) + 1.1) * 10) / 10; - - for (let j = 0; j < Object.keys(thisGame.bets).length; j++) { - if (Object.values(thisGame.bets)[j].horse === i + 1) { - winnings.push([Object.keys(thisGame.bets)[j], Object.values(thisGame.bets)[j].amount * profit[thisGame.horseSpeeds[i]]]); - } - } - - if (winnings.length === 0) { - for (let j = 0; j < Object.keys(thisGame.bets).length; j++) { - if (Object.values(thisGame.bets)[j].horse !== i + 1) { - const memberData = await this.client.findOrCreateMember({ - id: Object.keys(thisGame.bets)[j], - guildID: message.guild.id - }); - - const info = { - user: message.translate("economy/transactions:HORSERACE"), - amount: Object.values(thisGame.bets)[j].amount, - date: Date.now(), - type: "send" - }; - - memberData.transactions.push(info); - memberData.money -= Object.values(thisGame.bets)[j].amount; - } - } - - message.sendT("economy/horserace:NO_WINNERS", { - horse: i + 1 - }); - } else { - let winners = ""; - for (let j = 0; j < winnings.length; j++) { - winners += `\n<@${winnings[j][0]}> выиграл **${Math.floor(winnings[j][1])}** ${message.getNoun(Math.floor(winnings[j][1]), message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}!`; - - const memberData = await this.client.findOrCreateMember({ - id: winnings[j][0], - guildID: message.guild.id - }); - - const toAdd = Math.floor(winnings[j][1]) - Object.values(thisGame.bets)[j].amount; - - const info = { - user: message.translate("economy/transactions:HORSERACE"), - amount: toAdd, - date: Date.now(), - type: "got" - }; - - memberData.transactions.push(info); - memberData.money += toAdd; - memberData.save(); - } - - message.sendT("economy/horserace:WINNERS", { - horse: i + 1, - winners - }); - } - - delete games[message.channel.id]; - return; - } - } - } - } - } - } -} - -module.exports = Horserace; \ No newline at end of file diff --git a/!TO REWRITE/Economy/importmee6.js b/!TO REWRITE/Economy/importmee6.js deleted file mode 100644 index c76f0352..00000000 --- a/!TO REWRITE/Economy/importmee6.js +++ /dev/null @@ -1,29 +0,0 @@ -const { getUserXp } = require("mee6-levels-api"); -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -class ImportMee6 extends Command { - constructor(client) { - super(client, { - name: "money", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: [], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - await getUserXp(message.guild.id, message.author.id).then(user => { - Levels.setLevel(message.author.id, message.guild.id, user.level); - message.lineReply(`Ваш уровень Mee6 синхронизирован! Новый уровень - ${user.level}`); - }); - } -}; - -module.exports = ImportMee6; \ No newline at end of file diff --git a/!TO REWRITE/Economy/leaderboard.js b/!TO REWRITE/Economy/leaderboard.js deleted file mode 100644 index 86a4e59c..00000000 --- a/!TO REWRITE/Economy/leaderboard.js +++ /dev/null @@ -1,168 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -class Leaderboard extends Command { - constructor(client) { - super(client, { - name: "leaderboard", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["lb"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - const isOnMobile = (message.member.presence.clientStatus ? JSON.stringify(Object.keys(message.member.presence.clientStatus)) === JSON.stringify(["mobile"]) : false); - - const type = args[0]; - if (!type || !["credits", "level", "rep"].includes(type)) return message.error("economy/leaderboard:MISSING_TYPE"); - - if (type === "credits") { - const members = await this.client.membersData.find({ - guildID: message.guild.id - }).lean(), - membersLeaderboard = members.map((m) => { - return { - id: m.id, - money: m.money + m.bankSold - }; - }).sort((a, b) => b.money - a.money); - if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; - - let userNames = ""; - let money = ""; - for (let i = 0; i < membersLeaderboard.length; i++) { - const data = membersLeaderboard[i]; - const user = (await this.client.users.fetch(data.id)).tag; - - userNames += `**${i + 1}**. ${user}\n`; - money += `${data.money}\n`; - } - - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/leaderboard:TABLE", { - name: message.guild.name - }), - iconURL: message.guild.iconURL() - }) - .setColor(data.config.embed.color) - .addFields({ - name: message.translate("economy/leaderboard:TOP"), - value: userNames, - inline: true - }, { - name: message.translate("common:CREDITS"), - value: money, - inline: true - }); - - message.reply({ - embeds: [embed] - }); - } else if (type === "level") { - const members = await this.client.membersData.find({ - guildID: message.guild.id - }).lean(), - membersLeaderboard = members.map((m) => { - return { - id: m.id, - level: m.level, - xp: m.exp - }; - }).sort((a, b) => b.level - a.level); - if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; - - let userNames = ""; - let level = ""; - let xp = ""; - for (let i = 0; i < membersLeaderboard.length; i++) { - const data = membersLeaderboard[i]; - const user = (await this.client.users.fetch(data.id)).tag; - - userNames += `**${i + 1}**. ${user}\n`; - level += `${data.level}\n`; - xp += `${data.xp} / ${5 * (data.level * data.level) + 80 * data.level + 100}\n`; - } - - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/leaderboard:TABLE", { - name: message.guild.name - }), - iconURL: message.guild.iconURL() - }) - .setColor(data.config.embed.color) - .addFields({ - name: message.translate("economy/leaderboard:TOP"), - value: userNames, - inline: true - }, { - name: message.translate("common:LEVEL"), - value: level, - inline: true - }, { - name: message.translate("common:XP"), - value: xp, - inline: true - }); - - message.reply({ - embeds: [embed] - }); - } else if (type === "rep") { - const users = await this.client.usersData.find({ - rep: { $gt: 0 } - }).lean(), - usersLeaderboard = users.map((u) => { - return { - id: u.id, - rep: u.rep - }; - }).sort((a, b) => b.rep - a.rep); - if (usersLeaderboard.length > 20) usersLeaderboard.length = 20; - - let userNames = ""; - let rep = ""; - for (let i = 0; i < usersLeaderboard.length; i++) { - const data = usersLeaderboard[i]; - const user = (await this.client.users.fetch(data.id)).tag; - - userNames += `**${i + 1}**. ${user}\n`; - rep += `${data.rep}\n`; - } - - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/leaderboard:TABLE", { - name: message.guild.name - }), - iconURL: message.guild.iconURL() - }) - .setColor(data.config.embed.color) - .addFields({ - name: message.translate("economy/leaderboard:TOP"), - value: userNames, - inline: true - }, { - name: message.translate("common:REP"), - value: rep, - inline: true - }); - - message.reply({ - embeds: [embed] - }); - } - - if (isOnMobile) message.sendT("economy/leaderboard:MOBILE"); - } -} - -module.exports = Leaderboard; \ No newline at end of file diff --git a/!TO REWRITE/Economy/marry.js b/!TO REWRITE/Economy/marry.js deleted file mode 100644 index 7b9bf1bd..00000000 --- a/!TO REWRITE/Economy/marry.js +++ /dev/null @@ -1,134 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -const pendings = {}; - -class Marry extends Command { - constructor(client) { - super(client, { - name: "marry", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: [], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - if (data.userData.lover) return message.error("economy/marry:ALREADY_MARRIED", { prefix: data.guildData.prefix }); - - const member = await this.client.resolveMember(args[0], message.guild); - if (!member) return message.error("economy/marry:INVALID_MEMBER"); - - const userData = await this.client.findOrCreateUser({ - id: member.id - }); - - if (userData.lover) return message.error("economy/marry:ALREADY_MARRIED_USER", { username: member.user.tag }); - if (member.user.bot) return message.error("economy/marry:BOT_USER"); - if (member.id === message.author.id) return message.error("economy/marry:YOURSELF"); - - for (const requester in pendings) { - const receiver = pendings[requester]; - // If the member already sent a request to someone - if (requester === message.author.id) { - const user = this.client.users.cache.get(receiver) || await this.client.users.fetch(receiver); - return message.error("economy/marry:REQUEST_AUTHOR_TO_AMEMBER", { - username: user.tag - }); - } else if (receiver === message.author.id) { // If there is a pending request for this member - const user = this.client.users.cache.get(requester) || await this.client.users.fetch(requester); - return message.error("economy/marry:REQUEST_AMEMBER_TO_AUTHOR", { - username: user.tag - }); - } else if (requester === member.id) { // If the asked member has sent pending request - const user = this.client.users.cache.get(receiver) || await this.client.users.fetch(receiver); - return message.error("economy/marry:REQUEST_AMEMBER_TO_MEMBER", { - firstUsername: member.user.tag, - secondUsername: user.tag - }); - } else if (receiver === member.id) { // If there is a pending request for the asked member - const user = this.client.users.cache.get(requester) || await this.client.users.fetch(requester); - return message.error("economy/marry:REQUEST_MEMBER_TO_AMEMBER", { - firstUsername: member.user.tag, - secondUsername: user.tag - }); - } - } - - // Update pending requests - pendings[message.author.id] = member.id; - - message.sendT("economy/marry:REQUEST", { - from: message.author.toString(), - to: member.user.toString() - }); - - const filter = m => m.author.id === member.id; - const collector = new Discord.MessageCollector(message.channel, { - filter, - time: 120000 - }); - - collector.on("collect", (msg) => { - if (msg.content.toLowerCase() === message.translate("common:YES").toLowerCase()) { - return collector.stop(true); - } else if (msg.content.toLowerCase() === message.translate("common:NO").toLowerCase()) { - return collector.stop(false); - } else { - return message.error("misc:INVALID_YES_NO"); - } - }); - - collector.on("end", async (_collected, reason) => { - // Delete pending request - delete pendings[message.author.id]; - if (reason === "time") return message.error("economy/marry:TIMEOUT", { username: member.user.toString() }); - if (reason) { - data.userData.lover = member.id; - await data.userData.save(); - userData.lover = message.author.id; - await userData.save(); - const messageOptions = { - content: `${member.toString()} :heart: ${message.author.toString()}`, - files: [{ - name: "achievement_unlocked3.png", - attachment: "./assets/img/achievements/achievement_unlocked3.png" - }] - }; - let sent = false; - if (!userData.achievements.married.achieved) { - message.channel.send(messageOptions); - sent = true; - userData.achievements.married.achieved = true; - userData.achievements.married.progress.now = 1; - userData.markModified("achievements.married"); - userData.save(); - } - if (!data.userData.achievements.married.achieved) { - if (!sent) message.channel.send(messageOptions); - data.userData.achievements.married.achieved = true; - data.userData.achievements.married.progress.now = 1; - data.userData.markModified("achievements.married"); - data.userData.save(); - } - return message.success("economy/marry:SUCCESS", { - creator: message.author.toString(), - partner: member.user.toString() - }); - } else { - return message.success("economy/marry:DENIED", { - creator: message.author.toString(), - partner: member.user.toString() - }); - } - }); - } -} - -module.exports = Marry; \ No newline at end of file diff --git a/!TO REWRITE/Economy/money.js b/!TO REWRITE/Economy/money.js deleted file mode 100644 index 0b425da9..00000000 --- a/!TO REWRITE/Economy/money.js +++ /dev/null @@ -1,88 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -const asyncForEach = async (collection, callback) => { - const allPromises = collection.map(async key => { - await callback(key); - }); - - return await Promise.all(allPromises); -}; - -class Money extends Command { - constructor(client) { - super(client, { - name: "money", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["balance", "mon"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - let member = await this.client.resolveMember(args[0], message.guild); - if (!member) member = message.member; - const user = member.user; - - if (user.bot) return message.error("misc:BOT_USER"); - - const memberData = (message.author === user) ? data.memberData : await this.client.findOrCreateMember({ - id: user.id, - guildID: message.guild.id - }); - - const commonsGuilds = this.client.guilds.cache.filter((g) => g.members.cache.get(user.id)); - let globalMoney = 0; - await asyncForEach(commonsGuilds, async (guild) => { - const data = await this.client.findOrCreateMember({ - id: user.id, - guildID: guild.id - }); - globalMoney += data.money; - globalMoney += data.bankSold; - }); - - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/money:TITLE", { - username: member.user.username - }), - iconURL: member.user.displayAvatarURL({ - extension: "png", - size: 512 - }) - }) - .addFields([ - { - name: message.translate("economy/profile:CASH"), - value: `**${memberData.money}** ${message.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:BANK"), - value: `**${memberData.bankSold}** ${message.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:GLOBAL"), - value: `**${globalMoney}** ${message.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - } - ]) - .setColor(data.config.embed.color) - .setFooter({ - text: data.config.embed.footer - }); - message.reply({ - embeds: [embed] - }); - } -} - -module.exports = Money; \ No newline at end of file diff --git a/!TO REWRITE/Economy/number.js b/!TO REWRITE/Economy/number.js deleted file mode 100644 index 4a22f0c8..00000000 --- a/!TO REWRITE/Economy/number.js +++ /dev/null @@ -1,97 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -const currentGames = {}; - -class Number extends Command { - constructor(client) { - super(client, { - name: "number", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["num"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - if (currentGames[message.guild.id]) return message.error("economy/number:GAME_RUNNING"); - - const participants = [], - number = this.client.functions.randomNum(1000, 6000); - - await message.sendT("economy/number:GAME_START"); - - // Store the date wich the game has started - const gameCreatedAt = Date.now(); - - const filter = m => !m.author.bot; - const collector = new Discord.MessageCollector(message.channel, { - filter, - time: 480000 // 8 minutes - }); - currentGames[message.guild.id] = true; - - collector.on("collect", async msg => { - if (!participants.includes(msg.author.id)) participants.push(msg.author.id); - if (msg.content === "STOP") return collector.stop("force"); - if (isNaN(msg.content)) return; - - const parsedNumber = parseInt(msg.content, 10); - - if (parsedNumber === number) { - const time = this.client.convertTime(message.guild, Date.now() - gameCreatedAt); - message.sendT("economy/number:GAME_STATS", { - winner: msg.author.toString(), - number, - time, - participantCount: participants.length, - participants: participants.map(p => `<@${p}>`).join(", ") - }); - - if (participants.length > 1 && data.guildData.disabledCategories && !data.guildData.disabledCategories.includes("Economy")) { - const won = 100 * (participants.length * 0.5); - - message.sendT("economy/number:WON", { - winner: msg.author.username, - credits: `**${won}** ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); - - const memberData = await this.client.findOrCreateMember({ - id: msg.author.id, - guildID: message.guild.id - }); - - const info = { - user: message.translate("economy/transactions:NUMBERS"), - amount: won, - date: Date.now(), - type: "got" - }; - - data.memberData.transactions.push(info); - - memberData.money += won; - memberData.save(); - } - - collector.stop(); - } - if (parseInt(msg.content) < number) message.error("economy/number:BIG", { user: msg.author.toString(), number: parsedNumber }); - if (parseInt(msg.content) > number) message.error("economy/number:SMALL", { user: msg.author.toString(), number: parsedNumber }); - }); - - collector.on("end", (_collected, reason) => { - delete currentGames[message.guild.id]; - if (reason === "time") return message.error("economy/number:DEFEAT", { number }); - else if (reason === "force") return message.error("misc:FORCE_STOP", { user: message.author.toString() }); - }); - } -} - -module.exports = Number; \ No newline at end of file diff --git a/!TO REWRITE/Economy/pay.js b/!TO REWRITE/Economy/pay.js deleted file mode 100644 index 0afd9c9c..00000000 --- a/!TO REWRITE/Economy/pay.js +++ /dev/null @@ -1,59 +0,0 @@ -const Command = require("../../base/Command"); - -class Pay extends Command { - constructor(client) { - super(client, { - name: "pay", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: [], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - const member = await this.client.resolveMember(args[0], message.guild); - if (!member) return message.error("economy/pay:INVALID_MEMBER"); - if (member.user.bot) return message.error("economy/pay:BOT_USER"); - if (member.id === message.author.id) return message.error("economy/pay:YOURSELF"); - - const sentAmount = args[1]; - if (!sentAmount || isNaN(sentAmount) || parseInt(sentAmount, 10) <= 0) return message.error("economy/pay:INVALID_AMOUNT"); - - const amount = Math.ceil(parseInt(sentAmount, 10)); - if (amount > data.memberData.money) return message.error("economy/pay:ENOUGH_MONEY", { - amount: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}` - }); - - const memberData = await this.client.findOrCreateMember({ - id: member.id, - guildID: message.guild.id - }); - - const info = { - user: member.user.tag, - amount: parseInt(amount, 10), - date: Date.now(), - type: "send" - }; - - data.memberData.transactions.push(info); - data.memberData.money = data.memberData.money - parseInt(amount, 10); - data.memberData.save(); - - memberData.money = memberData.money + parseInt(amount, 10); - memberData.save(); - - message.success("economy/pay:SUCCESS", { - amount: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - username: member.user.tag - }); - } -} - -module.exports = Pay; \ No newline at end of file diff --git a/!TO REWRITE/Economy/profile.js b/!TO REWRITE/Economy/profile.js deleted file mode 100644 index 7cf3b353..00000000 --- a/!TO REWRITE/Economy/profile.js +++ /dev/null @@ -1,144 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -const asyncForEach = async (collection, callback) => { - const allPromises = collection.map(async key => { - await callback(key); - }); - - return await Promise.all(allPromises); -}; - -class Profile extends Command { - constructor(client) { - super(client, { - name: "profile", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["prof"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - const arg = args[0] || message.author; - let member = await this.client.resolveMember(arg, message.guild); - if (!member) member = message.member; - if (member.user.bot) return message.error("economy/profile:BOT_USER"); - - const memberData = (member.id === message.author.id ? data.memberData : await this.client.findOrCreateMember({ - id: member.id, - guildID: message.guild.id - })); - const userData = (member.id === message.author.id ? data.userData : await this.client.findOrCreateUser({ - id: member.id - })); - if (userData.lover && !this.client.users.cache.get(userData.lover)) await this.client.users.fetch(userData.lover, true); - - const commonsGuilds = this.client.guilds.cache.filter((g) => g.members.cache.get(member.id)); - let globalMoney = 0; - await asyncForEach(commonsGuilds, async (guild) => { - const data = await this.client.findOrCreateMember({ - id: member.id, - guildID: guild.id - }); - globalMoney += data.money; - globalMoney += data.bankSold; - }); - - const profileEmbed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/profile:TITLE", { - username: member.user.tag - }), - iconURL: member.user.displayAvatarURL({ - extension: "png", - size: 512 - }) - }) - .setImage("attachment://achievements.png") - .addFields([ - { - name: this.client.customEmojis.link + " " + message.translate("economy/profile:LINK"), - value: `[${message.translate("economy/profile:LINK_TEXT")}](${this.client.config.dashboard.baseURL}/user/${member.user.id}/${message.guild.id})` - }, - { - name: message.translate("economy/profile:BIO"), - value: userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO") - }, - { - name: message.translate("economy/profile:CASH"), - value: `**${memberData.money}** ${message.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:BANK"), - value: `**${memberData.bankSold}** ${message.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:GLOBAL"), - value: `**${globalMoney}** ${message.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:REPUTATION"), - value: `**${userData.rep}** ${message.getNoun(userData.rep, message.translate("misc:NOUNS:POINTS:1"), message.translate("misc:NOUNS:POINTS:2"), message.translate("misc:NOUNS:POINTS:5"))}`, - inline: true - }, - { - name: message.translate("economy/profile:LEVEL"), - value:`**${memberData.level}**`, - inline: true - }, - { - name: message.translate("economy/profile:EXP"), - value: `**${memberData.exp}/${5 * (memberData.level * memberData.level) + 80 * memberData.level + 100}** xp`, - inline: true - }, - { - name: message.translate("economy/profile:REGISTERED"), - value: this.client.printDate(new Date(memberData.registeredAt)), - inline: true - }, - { - name: message.translate("economy/profile:BIRTHDATE"), - value: (!userData.birthdate ? message.translate("economy/profile:NO_BIRTHDATE") : this.client.printDate(new Date(userData.birthdate))), - inline: true - }, - { - name: message.translate("economy/profile:LOVER"), - value: (!userData.lover ? message.translate("economy/profile:NO_LOVER") : this.client.users.cache.get(userData.lover).tag), - inline: true - }, - { - name: message.translate("economy/profile:ACHIEVEMENTS"), - value: message.translate("economy/profile:ACHIEVEMENTS_CONTENT", { - prefix: data.guildData.prefix - }) - } - ]) - .setColor(data.config.embed.color) // Sets the color of the embed - .setFooter({ - text: data.config.embed.footer - }) // Sets the footer of the embed - .setTimestamp(); - - const buffer = await userData.getAchievements(); - - message.reply({ - embeds: [profileEmbed], - files: [{ - name: "achievements.png", - attachment: buffer - }] - }); - } -} - -module.exports = Profile; \ No newline at end of file diff --git a/!TO REWRITE/Economy/rep.js b/!TO REWRITE/Economy/rep.js deleted file mode 100644 index dc4ba37f..00000000 --- a/!TO REWRITE/Economy/rep.js +++ /dev/null @@ -1,71 +0,0 @@ -const Command = require("../../base/Command"); - -class Rep extends Command { - constructor(client) { - super(client, { - name: "rep", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["reputation"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - // if the member is already in the cooldown db - const isInCooldown = (data.userData.cooldowns || { - rep: 0 - }).rep; - if (isInCooldown) { - /*if the timestamp recorded in the database indicating - when the member will be able to execute the order again - is greater than the current date, display an error message */ - if (isInCooldown > Date.now()) return message.error("economy/rep:COOLDOWN", { - time: this.client.convertTime(isInCooldown, "to", true) - }); - } - - const user = await this.client.resolveUser(args[0]); - if (!user) return message.error("economy/rep:INVALID_USER"); - if (user.bot) return message.error("economy/rep:BOT_USER"); - if (user.id === message.author.id) return message.error("economy/rep:YOURSELF"); - - // Records in the database the time when the member will be able to execute the command again (in 12 hours) - const toWait = Date.now() + 21600000; - data.userData.cooldowns = {}; - data.userData.cooldowns.rep = toWait; - data.userData.markModified("cooldowns"); - data.userData.save(); - - const userData = await this.client.findOrCreateUser({ - id: user.id - }); - userData.rep++; - if (!userData.achievements.rep.achieved) { - userData.achievements.rep.progress.now = (userData.rep > userData.achievements.rep.progress.total ? userData.achievements.rep.progress.total : userData.rep); - if (userData.achievements.rep.progress.now >= userData.achievements.rep.progress.total) { - userData.achievements.rep.achieved = true; - message.channel.send({ - content: `${user}`, - files: [{ - name: "achievement_unlocked6.png", - attachment: "./assets/img/achievements/achievement_unlocked6.png" - }] - }); - } - userData.markModified("achievements.rep"); - } - await userData.save(); - - message.success("economy/rep:SUCCESS", { - username: user.username - }); - } -} - -module.exports = Rep; \ No newline at end of file diff --git a/!TO REWRITE/Economy/rob.js b/!TO REWRITE/Economy/rob.js deleted file mode 100644 index ea682ba1..00000000 --- a/!TO REWRITE/Economy/rob.js +++ /dev/null @@ -1,78 +0,0 @@ -const Command = require("../../base/Command"); - -class Rob extends Command { - constructor(client) { - super(client, { - name: "rob", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["steal"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - 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({ - id: member.id, - guildID: message.guild.id - }); - const isInCooldown = memberData.cooldowns.rob || 0; - if (isInCooldown) { - if (isInCooldown > Date.now()) return message.error("economy/rob:COOLDOWN", { user: member.user }); - } - - let amountToRob = args[1]; - if (!amountToRob || isNaN(amountToRob) || parseInt(amountToRob, 10) <= 0) return message.error("economy/rob:MISSING_AMOUNT", { user: member.user }); - - amountToRob = Math.floor(parseInt(amountToRob, 10)); - - if (amountToRob > memberData.money) return message.error("economy/rob:NOT_ENOUGH_MEMBER", { user: member.user }); - - const potentiallyLose = Math.floor(amountToRob * 1.5); - if (potentiallyLose > data.memberData.money) return message.error("economy/rob:NOT_ENOUGH_AUTHOR", { - moneyMin: `${potentiallyLose} ${message.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - moneyCurrent: `${data.memberData.money} ${message.getNoun(data.memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); - - const itsAWon = Math.floor(this.client.functions.randomNum(0, 100) < 25); - - if (itsAWon) { - const toWait = Date.now() + 6 * (60 * 60000); // 6 hours - memberData.cooldowns.rob = toWait; - memberData.markModified("cooldowns"); - await memberData.save(); - const randomNum = this.client.functions.randomNum(1, 2); - message.sendT("economy/rob:ROB_WON_" + randomNum, { - money: `${amountToRob} ${message.getNoun(amountToRob, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - user: member.user - }); - data.memberData.money += amountToRob; - memberData.money -= amountToRob, 10; - memberData.save(); - data.memberData.save(); - } else { - const won = Math.floor(0.9 * amountToRob); - const randomNum = this.client.functions.randomNum(1, 2); - message.sendT("economy/rob:ROB_LOSE_" + randomNum, { - fine: `${potentiallyLose} ${message.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - offset: `${won} ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - user: member.user - }); - data.memberData.money -= potentiallyLose; - memberData.money += won; - memberData.save(); - data.memberData.save(); - } - } -} - -module.exports = Rob; \ No newline at end of file diff --git a/!TO REWRITE/Economy/setbio.js b/!TO REWRITE/Economy/setbio.js deleted file mode 100644 index d3e8998e..00000000 --- a/!TO REWRITE/Economy/setbio.js +++ /dev/null @@ -1,30 +0,0 @@ -const Command = require("../../base/Command"); - -class Setbio extends Command { - constructor(client) { - super(client, { - name: "setbio", - dirname: __dirname, - enabled: true, - guildOnly: false, - aliases: ["biography", "setdesc", "sb"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - const newBio = args.join(" "); - if (!newBio) return message.error("economy/setbio:MISSING"); - if (newBio.length > 100) return message.error("economy/setbio:MAX_CHARACT"); - - data.userData.bio = newBio; - message.success("economy/setbio:SUCCESS"); - await data.userData.save(); - } -} - -module.exports = Setbio; \ No newline at end of file diff --git a/!TO REWRITE/Economy/tictactoe.js b/!TO REWRITE/Economy/tictactoe.js deleted file mode 100644 index e011cdd9..00000000 --- a/!TO REWRITE/Economy/tictactoe.js +++ /dev/null @@ -1,46 +0,0 @@ -const Command = require("../../base/Command"), - tictactoe = require("../../helpers/tictactoe"); - -class TicTacToe extends Command { - constructor(client) { - super(client, { - name: "tictactoe", - dirname: __dirname, - enabled: true, - guildOnly: false, - aliases: ["ttt"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - tictactoe(message, { - resultBtn: true, - embedColor: data.config.embed.color, - embedFoot: data.config.embed.footer - }).then(async winner => { - const memberData = await this.client.findOrCreateMember({ - id: winner.id, - guildID: message.guild.id - }); - - const info = { - user: message.translate("economy/transactions:TTT"), - amount: 100, - date: Date.now(), - type: "got" - }; - - memberData.transactions.push(info); - - memberData.money += 100; - memberData.save(); - }); - } -} - -module.exports = TicTacToe; \ No newline at end of file diff --git a/!TO REWRITE/Economy/transactions.js b/!TO REWRITE/Economy/transactions.js deleted file mode 100644 index 6f82685c..00000000 --- a/!TO REWRITE/Economy/transactions.js +++ /dev/null @@ -1,67 +0,0 @@ -const Command = require("../../base/Command"), - Discord = require("discord.js"); - -class Transactions extends Command { - constructor(client) { - super(client, { - name: "transactions", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["tr"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 - }); - } - - async run(message, args, data) { - const embed = new Discord.EmbedBuilder() - .setAuthor({ - name: message.translate("economy/transactions:EMBED_TRANSACTIONS"), - iconURL: message.author.displayAvatarURL({ - extension: "png", - size: 512 - }) - }) - .setColor(data.config.embed.color) - .setFooter({ - text: data.config.embed.footer - }); - - const transactions = data.memberData.transactions, - sortedTransactions = [ [], [] ]; - - transactions.slice(-20).forEach((t) => { - const array = t.type === "got" ? sortedTransactions[0] : sortedTransactions[1]; - array.push(`${message.translate("economy/transactions:T_USER_" + t.type.toUpperCase())}: ${t.user}\n${message.translate("economy/transactions:T_AMOUNT")}: ${t.amount}\n${message.translate("economy/transactions:T_DATE")}: ${this.client.printDate(t.date, "Do MMMM YYYY, HH:mm")}\n`); - }); - - if (transactions.length < 1) { - embed.setDescription(message.translate("economy/transactions:NO_TRANSACTIONS")); - } else { - if (sortedTransactions[0].length > 0) embed.addFields([ - { - name: message.translate("economy/transactions:T_GOT"), - value: sortedTransactions[0].join("\n"), - inline: true - } - ]); - if (sortedTransactions[1].length > 0) embed.addFields([ - { - name: message.translate("economy/transactions:T_SEND"), - value: sortedTransactions[1].join("\n"), - inline: true - } - ]); - } - - message.reply({ - embeds: [embed] - }); - } -} - -module.exports = Transactions; \ No newline at end of file diff --git a/!TO REWRITE/Economy/withdraw.js b/!TO REWRITE/Economy/withdraw.js deleted file mode 100644 index f19dc6ad..00000000 --- a/!TO REWRITE/Economy/withdraw.js +++ /dev/null @@ -1,52 +0,0 @@ -const Command = require("../../base/Command"); - -class Withdraw extends Command { - constructor(client) { - super(client, { - name: "withdraw", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["wd"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - let amount = args[0]; - - if (!(parseInt(data.memberData.bankSold, 10) > 0)) return message.error("economy/withdraw:NO_CREDIT"); - - if (args[0] === "all") { - amount = parseInt(data.memberData.bankSold, 10); - } else { - if (isNaN(amount) || parseInt(amount, 10) < 1) return message.error("economy/withdraw:MISSING_AMOUNT"); - 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"))}` }); - - const info = { - user: message.translate("economy/transactions:BANK"), - amount: amount, - date: Date.now(), - type: "got" - }; - - data.memberData.transactions.push(info); - - data.memberData.money = data.memberData.money + amount; - data.memberData.bankSold = data.memberData.bankSold - amount; - data.memberData.save(); - - message.success("economy/withdraw:SUCCESS", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }); - } -} - -module.exports = Withdraw; \ No newline at end of file diff --git a/!TO REWRITE/Economy/work.js b/!TO REWRITE/Economy/work.js deleted file mode 100644 index 283cbbc1..00000000 --- a/!TO REWRITE/Economy/work.js +++ /dev/null @@ -1,129 +0,0 @@ -const Command = require("../../base/Command"), - { parseEmoji, EmbedBuilder } = require("discord.js"); - -class Work extends Command { - constructor(client) { - super(client, { - name: "work", - dirname: __dirname, - enabled: true, - guildOnly: true, - aliases: ["salary", "daily"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 1000 - }); - } - - async run(message, args, data) { - // if the member is already in the cooldown db - const isInCooldown = data.memberData.cooldowns.work; - if (isInCooldown) { - /*if the timestamp recorded in the database indicating - when the member will be able to execute the order again - is greater than the current date, display an error message */ - if (isInCooldown > Date.now()) return message.error("economy/work:COOLDOWN", { - time: this.client.convertTime(isInCooldown, "to", true) - }); - } - - if (Date.now() > data.memberData.cooldowns.work + (24 * 3600000)) data.memberData.workStreak = 0; - - // Records in the database the time when the member will be able to execute the command again (in 12 hours) - const toWait = Date.now() + 43200000; - data.memberData.cooldowns.work = toWait; - data.memberData.markModified("cooldowns"); - - data.memberData.workStreak = (data.memberData.workStreak || 0) + 1; - await data.memberData.save(); - - const embed = new EmbedBuilder() - .setFooter({ - text: message.translate("economy/work:AWARD"), - iconURL: message.author.displayAvatarURL({ - extension: "png", - size: 512 - }) - }) - .setColor(data.config.embed.color); - - const award = [ - this.client.customEmojis.letters.a, - this.client.customEmojis.letters.w, - this.client.customEmojis.letters.a, - this.client.customEmojis.letters.r, - this.client.customEmojis.letters.d - ]; - let won = 200; - - if (data.memberData.workStreak >= 5) { - won += 200; - embed.addFields([ - { - name: message.translate("economy/work:SALARY"), - value: message.translate("economy/work:SALARY_CONTENT", { - won: `${won} ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }) - }, - { - name: message.translate("economy/work:STREAK"), - value: message.translate("economy/work:STREAK_CONTENT") - } - ]); - data.memberData.workStreak = 0; - } else { - for (let i = 0; i < award.length; i++) { - if (data.memberData.workStreak > i) { - const letter = parseEmoji(award[i]).name.split("_")[1]; - award[i] = `:regional_indicator_${letter.toLowerCase()}:`; - } - } - embed.addFields([ - { - name: message.translate("economy/work:SALARY"), - value: message.translate("economy/work:SALARY_CONTENT", { - won: `**${won}** ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}` - }) - }, - { - name: message.translate("economy/work:STREAK"), - value: award.join("") - } - ]); - } - - const info = { - user: message.translate("economy/work:SALARY"), - amount: won, - date: Date.now(), - type: "got" - }; - - data.memberData.transactions.push(info); - data.memberData.money = data.memberData.money + won; - data.memberData.save(); - - const messageOptions = { - embeds: [embed] - }; - if (!data.userData.achievements.work.achieved) { - data.userData.achievements.work.progress.now += 1; - if (data.userData.achievements.work.progress.now === data.userData.achievements.work.progress.total) { - messageOptions.files = [{ - name: "unlocked.png", - attachment: "./assets/img/achievements/achievement_unlocked1.png" - }]; - data.userData.achievements.work.achieved = true; - } - data.userData.markModified("achievements.work"); - data.userData.save(); - } - - // Send the embed in the current channel - message.reply(messageOptions); - } -} - -module.exports = Work; \ No newline at end of file diff --git a/TO REWRITE/leaderboard.js b/TO REWRITE/leaderboard.js new file mode 100644 index 00000000..932efaad --- /dev/null +++ b/TO REWRITE/leaderboard.js @@ -0,0 +1,195 @@ +const { SlashCommandBuilder, EmbedBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Leaderboard extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("leaderboard") + .setDescription(client.translate("economy/leaderboard:DESCRIPTION")) + .addStringOption(option => option.setName("type") + .setDescription(client.translate("owner/debug:TYPE")) + .setRequired(true) + .addChoices( + { name: client.translate("economy/leaderboard:LEVEL"), value: "level" }, + { name: client.translate("economy/leaderboard:MONEY"), value: "money" }, + { name: client.translate("economy/leaderboard:REP"), value: "rep" } + )), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction) { + await interaction.deferReply(); + const type = interaction.options.getString("type"); + const isOnMobile = JSON.stringify(Object.keys(interaction.member.presence.clientStatus)) === JSON.stringify(["mobile"]); + if (isOnMobile) interaction.followUp({ + content: interaction.translate("economy/leaderboard:MOBILE"), + ephemeral: true + }); + + if (type === "money") { + const members = await client.membersData.find({ + guildID: interaction.guildId + }).lean(), + membersLeaderboard = members.map(m => { + return { + id: m.id, + money: m.money + m.bankSold + }; + }).sort((a, b) => b.money - a.money); + if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; + + let userNames = ""; + let money = ""; + for (let i = 0; i < membersLeaderboard.length; i++) { + const data = membersLeaderboard[i]; + const user = await client.users.fetch(data.id); + + userNames += `**${i + 1}**. ${user}\n`; + money += `${data.money}\n`; + } + + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/leaderboard:TABLE", { + name: interaction.guild.name + }), + iconURL: interaction.guild.iconURL() + }) + .setColor(client.config.embed.color) + .addFields({ + name: interaction.translate("economy/leaderboard:TOP"), + value: userNames, + inline: true + }, { + name: interaction.translate("common:CREDITS"), + value: money, + inline: true + }); + + interaction.editReply({ + embeds: [embed] + }); + } else if (type === "level") { + const membersLeaderboard = []; + client.membersData.find({ + guildID: interaction.guildId + }).lean().then(async m => { + await membersLeaderboard.push({ + id: m.id, + level: m.level, + xp: m.exp + }); + }); + membersLeaderboard.sort((a, b) => b.level - a.level); + if (membersLeaderboard.length > 20) membersLeaderboard.length = 20; + + const userNames = []; + const level = []; + const xp = []; + for (let i = 0; i < membersLeaderboard.length; i++) { + const data = membersLeaderboard[i]; + const user = await client.users.fetch(data.id); + + userNames.push(`**${i + 1}**. ${user.tag}`); + level.push(`${data.level}`); + xp.push(`${data.xp} / ${5 * (data.level * data.level) + 80 * data.level + 100}`); + } + + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/leaderboard:TABLE", { + name: interaction.guild.name + }), + iconURL: interaction.guild.iconURL() + }) + .setColor(client.config.embed.color) + .addFields([ + { + name: interaction.translate("economy/leaderboard:TOP"), + value: userNames.join("\n"), + inline: true + }, + { + name: interaction.translate("common:LEVEL"), + value: level.join("\n"), + inline: true + }, + { + name: interaction.translate("common:XP"), + value: xp.join("\n"), + inline: true + } + ]); + + interaction.editReply({ + embeds: [embed] + }); + } else if (type === "rep") { + const users = await client.usersData.find({ + rep: { $gt: 0 } + }).lean(), + usersLeaderboard = users.map(u => { + return { + id: u.id, + rep: u.rep + }; + }).sort((a, b) => b.rep - a.rep); + if (usersLeaderboard.length > 20) usersLeaderboard.length = 20; + + let userNames = ""; + let rep = ""; + for (let i = 0; i < usersLeaderboard.length; i++) { + const data = usersLeaderboard[i]; + const user = await client.users.fetch(data.id); + + userNames += `**${i + 1}**. ${user}\n`; + rep += `${data.rep}\n`; + } + + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/leaderboard:TABLE", { + name: interaction.guild.name + }), + iconURL: interaction.guild.iconURL() + }) + .setColor(client.config.embed.color) + .addFields({ + name: interaction.translate("economy/leaderboard:TOP"), + value: userNames, + inline: true + }, { + name: interaction.translate("common:REP"), + value: rep, + inline: true + }); + + interaction.editReply({ + embeds: [embed] + }); + } + } +} + +module.exports = Leaderboard; \ No newline at end of file diff --git a/!TO REWRITE/seek.js b/TO REWRITE/seek.js similarity index 98% rename from !TO REWRITE/seek.js rename to TO REWRITE/seek.js index 06e8d390..30289020 100644 --- a/!TO REWRITE/seek.js +++ b/TO REWRITE/seek.js @@ -31,7 +31,7 @@ class Seek extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/Administration/automod.js b/commands/Administration/automod.js index a6cea8c3..f65afbf6 100644 --- a/commands/Administration/automod.js +++ b/commands/Administration/automod.js @@ -34,7 +34,7 @@ class Automod extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/autorole.js b/commands/Administration/autorole.js index 4c01ce0c..24b91fdc 100644 --- a/commands/Administration/autorole.js +++ b/commands/Administration/autorole.js @@ -33,13 +33,13 @@ class Autorole extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); if (state) { - const role = interaction.options.getRole("role", true); + const role = interaction.options.getRole("role"); if (!role) return interaction.error("administration/autorole:MISSING_ROLE"); data.guildData.plugins.autorole = { @@ -50,13 +50,9 @@ class Autorole extends BaseCommand { await data.guildData.save(); interaction.success("administration/autorole:SUCCESS_ENABLED", { - roleName: role.name + roleName: role.toString() }); } else { - if (!data.guildData.plugins.autorole.enabled) return interaction.success("administration/autorole:ALREADY_DISABLED", { - prefix: data.guildData.prefix - }); - data.guildData.plugins.autorole = { enabled: false, role: null @@ -64,9 +60,7 @@ class Autorole extends BaseCommand { data.guildData.markModified("plugins.autorole"); await data.guildData.save(); - interaction.success("administration/autorole:SUCCESS_DISABLED", { - prefix: data.guildData.prefix - }); + interaction.success("administration/autorole:SUCCESS_DISABLED"); } } } diff --git a/commands/Administration/config.js b/commands/Administration/config.js index 6db447c1..f9d4e03d 100644 --- a/commands/Administration/config.js +++ b/commands/Administration/config.js @@ -28,7 +28,7 @@ class Config extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const guildData = data.guildData; @@ -75,7 +75,7 @@ class Config extends BaseCommand { { name: interaction.translate("administration/config:AUTOMOD_TITLE"), value: guildData.plugins.automod.enabled ? interaction.translate("administration/config:AUTOMOD_CONTENT", { - channels: guildData.plugins.automod.ignored.map(ch => `<#${ch}>`) + channels: guildData.plugins.automod.ignored.map(ch => ` ${ch}`) }) : interaction.translate("common:DISABLED") }, { diff --git a/commands/Administration/deletemod.js b/commands/Administration/deletemod.js index 3eafe0c5..e062ffc2 100644 --- a/commands/Administration/deletemod.js +++ b/commands/Administration/deletemod.js @@ -31,7 +31,7 @@ class Deletemod extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/goodbye.js b/commands/Administration/goodbye.js index fc020145..7c110f6a 100644 --- a/commands/Administration/goodbye.js +++ b/commands/Administration/goodbye.js @@ -43,7 +43,7 @@ class Goodbye extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const command = interaction.options.getSubcommand(); diff --git a/commands/Administration/set.js b/commands/Administration/set.js index ee7f8637..6b60cd6b 100644 --- a/commands/Administration/set.js +++ b/commands/Administration/set.js @@ -19,8 +19,7 @@ class Set extends BaseCommand { { name: client.translate("common:LEVEL"), value: "level" }, { name: client.translate("common:XP"), value: "xp" }, { name: client.translate("common:CREDITS"), value: "credits" }, - { name: client.translate("economy/transactions:BANK"), value: "bank" }, - { name: client.translate("common:REP"), value: "rep" }, + { name: client.translate("economy/transactions:BANK"), value: "bank" } )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) @@ -45,56 +44,50 @@ class Set extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ - async execute(client, interaction, data) { + async execute(client, interaction) { const type = interaction.options.getString("type"); const member = interaction.options.getMember("user"); if (member.user.bot) return interaction.error("misc:BOT_USER", null, { ephemeral: true }); + const memberData = await client.findOrCreateMember({ + id: member.id + }); const int = interaction.options.getInteger("int"); if (int < 0) return interaction.error("administration/set:INVALID_NUMBER", null, { ephemeral: true }); switch (type) { case "level": { - data.memberData.level = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.level = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "xp": { - data.memberData.exp = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.exp = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "credits": { - data.memberData.money = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.money = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "bank": { - data.memberData.bankSold = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { - username: member.toString(), - amount: int - }, { ephemeral: true }); - } - - case "rep": { - data.memberData.rep = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.bankSold = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); diff --git a/commands/Administration/setbirthdays.js b/commands/Administration/setbirthdays.js index 5b73e34b..9a6a1cfb 100644 --- a/commands/Administration/setbirthdays.js +++ b/commands/Administration/setbirthdays.js @@ -34,7 +34,7 @@ class Setbirthdays extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/setlang.js b/commands/Administration/setlang.js index 9386de9d..2533ff99 100644 --- a/commands/Administration/setlang.js +++ b/commands/Administration/setlang.js @@ -35,7 +35,7 @@ class Setlang extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const lang = interaction.options.getString("language"); diff --git a/commands/Administration/setmodlogs.js b/commands/Administration/setmodlogs.js index 7d4deabe..0fcc618e 100644 --- a/commands/Administration/setmodlogs.js +++ b/commands/Administration/setmodlogs.js @@ -34,7 +34,7 @@ class Setmodlogs extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/setnews.js b/commands/Administration/setnews.js index 9c6d4110..920f4c8d 100644 --- a/commands/Administration/setnews.js +++ b/commands/Administration/setnews.js @@ -34,7 +34,7 @@ class Setnews extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/setreports.js b/commands/Administration/setreports.js index 9b1b549e..99fbd4da 100644 --- a/commands/Administration/setreports.js +++ b/commands/Administration/setreports.js @@ -34,7 +34,7 @@ class Setreports extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/setsuggests.js b/commands/Administration/setsuggests.js index 1b687abf..1af1f001 100644 --- a/commands/Administration/setsuggests.js +++ b/commands/Administration/setsuggests.js @@ -34,7 +34,7 @@ class Setsuggests extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const state = interaction.options.getBoolean("state"); diff --git a/commands/Administration/stealemoji.js b/commands/Administration/stealemoji.js index 08b96239..82bf1220 100644 --- a/commands/Administration/stealemoji.js +++ b/commands/Administration/stealemoji.js @@ -31,7 +31,7 @@ class Stealemoji extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const parsedEmoji = parseEmoji(interaction.options.getString("emoji")); @@ -46,9 +46,9 @@ class Stealemoji extends BaseCommand { emoji: emoji.name }, { ephemeral: true })) .catch(e => { - console.log(e); interaction.error("administration/stealemoji:ERROR", { - emoji: parsedEmoji.name + emoji: parsedEmoji.name, + e }, { ephemeral: true }); }); } diff --git a/commands/Administration/welcome.js b/commands/Administration/welcome.js index 25411b6f..af320614 100644 --- a/commands/Administration/welcome.js +++ b/commands/Administration/welcome.js @@ -43,7 +43,7 @@ class Welcome extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const command = interaction.options.getSubcommand(); diff --git a/commands/Economy/achievements.js b/commands/Economy/achievements.js new file mode 100644 index 00000000..76403b8c --- /dev/null +++ b/commands/Economy/achievements.js @@ -0,0 +1,116 @@ +const { SlashCommandBuilder, EmbedBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Achievements extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("achievements") + .setDescription(client.translate("economy/achievements:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER"))), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const member = interaction.options.getMember("user") || interaction.member; + if (member.user.bot) return interaction.error("economy/profile:BOT_USER"); + const userData = (member.id === interaction.member.id ? data.userData : await client.findOrCreateUser({ + id: member.id + })); + + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/achievements:TITLE") + }) + .setColor(client.config.embed.color) + .setFooter({ + text: client.config.embed.footer + }); + + embed.addFields([ + { + name: interaction.translate("economy/achievements:SEND_CMD"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.firstCommand.progress.now, + total: userData.achievements.firstCommand.progress.total, + percent: Math.round(100 * (userData.achievements.firstCommand.progress.now / userData.achievements.firstCommand.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:CLAIM_SALARY"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.work.progress.now, + total: userData.achievements.work.progress.total, + percent: Math.round(100 * (userData.achievements.work.progress.now / userData.achievements.work.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:MARRY"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.married.progress.now, + total: userData.achievements.married.progress.total, + percent: Math.round(100 * (userData.achievements.married.progress.now / userData.achievements.married.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:SLOTS"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.slots.progress.now, + total: userData.achievements.slots.progress.total, + percent: Math.round(100 * (userData.achievements.slots.progress.now / userData.achievements.slots.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:TIP"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.tip.progress.now, + total: userData.achievements.tip.progress.total, + percent: Math.round(100 * (userData.achievements.tip.progress.now / userData.achievements.tip.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:REP"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.rep.progress.now, + total: userData.achievements.rep.progress.total, + percent: Math.round(100 * (userData.achievements.rep.progress.now / userData.achievements.rep.progress.total)) + }) + }, + { + name: interaction.translate("economy/achievements:INVITE"), + value: interaction.translate("economy/achievements:PROGRESS", { + now: userData.achievements.invite.progress.now, + total: userData.achievements.invite.progress.total, + percent: Math.round(100 * (userData.achievements.invite.progress.now / userData.achievements.invite.progress.total)) + }) + } + ]); + + interaction.reply({ + embeds: [embed] + }); + } +} + +module.exports = Achievements; \ No newline at end of file diff --git a/commands/Economy/bank.js b/commands/Economy/bank.js new file mode 100644 index 00000000..74739421 --- /dev/null +++ b/commands/Economy/bank.js @@ -0,0 +1,92 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Bank extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("bank") + .setDescription(client.translate("economy/bank:DESCRIPTION")) + .addStringOption(option => option.setName("option") + .setDescription(client.translate("economy/bank:OPTION")) + .setRequired(true) + .addChoices( + { name: client.translate("economy/bank:DEPOSIT"), value: "deposit" }, + { name: client.translate("economy/bank:WITHDRAW"), value: "withdraw" } + )) + .addStringOption(option => option.setName("credits") + .setDescription(client.translate("moderation/clear:OPTION")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const choice = interaction.options.getString("option"); + + if (choice === "deposit") { + const credits = interaction.options.getString("credits") === "all" ? data.memberData.money : interaction.options.getString("credits"); + if (isNaN(credits) || credits < 1) return interaction.error("misc:OPTION_NAN_ALL"); + if (data.memberData.money < credits) return interaction.error("economy/bank:NOT_ENOUGH_CREDIT", { money: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` }); + + const info = { + user: interaction.translate("economy/transactions:BANK"), + amount: credits, + date: Date.now(), + type: "send" + }; + + data.memberData.transactions.push(info); + + data.memberData.money -= credits; + data.memberData.bankSold += credits; + await data.memberData.save(); + + interaction.success("economy/bank:SUCCESS_DEP", { + money: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }); + } else { + const credits = interaction.options.getString("credits") === "all" ? data.memberData.bankSold : interaction.options.getString("credits"); + if (isNaN(credits) || credits < 1) return interaction.error("misc:OPTION_NAN_ALL"); + if (data.memberData.bankSold < credits) return interaction.error("economy/bank:NOT_ENOUGH_BANK", { money: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` }); + + const info = { + user: interaction.translate("economy/transactions:BANK"), + amount: credits, + date: Date.now(), + type: "got" + }; + + data.memberData.transactions.push(info); + + data.memberData.money += credits; + data.memberData.bankSold -= credits; + await data.memberData.save(); + + interaction.success("economy/bank:SUCCESS_WD", { + money: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }); + } + } +} + +module.exports = Bank; \ No newline at end of file diff --git a/commands/Economy/birthdate.js b/commands/Economy/birthdate.js new file mode 100644 index 00000000..e898f29b --- /dev/null +++ b/commands/Economy/birthdate.js @@ -0,0 +1,57 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Birthdate extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("birthdate") + .setDescription(client.translate("economy/birthdate:DESCRIPTION")) + .addStringOption(option => option.setName("date") + .setDescription(client.translate("economy/birthdate:DATE")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const date = interaction.options.getString("date"); + const match = date.match(/\d+/g); + if (!match) return interaction.error("economy/birthdate:INVALID_DATE"); + const [day, month, year] = date.split("/"); + if (!day || !month || !year) return interaction.error("economy/birthdate:INVALID_DATE"); + + const d = new Date(year, month - 1, day); + if (!(day == d.getDate() && month - 1 == d.getMonth() && year == d.getFullYear())) return interaction.error("economy/birthdate:INVALID_DATE"); + if (d.getTime() > Date.now()) return interaction.error("economy/birthdate:DATE_TOO_HIGH"); + if (d.getTime() < (Date.now() - 2.523e+12)) return interaction.error("economy/birthdate:DATE_TOO_LOW"); + + data.userData.birthdate = d; + await data.userData.save(); + + interaction.success("economy/birthdate:SUCCESS", { + date: client.printDate(d) + }); + } +} + +module.exports = Birthdate; \ No newline at end of file diff --git a/commands/Economy/divorce.js b/commands/Economy/divorce.js new file mode 100644 index 00000000..d6645993 --- /dev/null +++ b/commands/Economy/divorce.js @@ -0,0 +1,58 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Divorce extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("divorce") + .setDescription(client.translate("economy/divorce:DESCRIPTION")), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + if (!data.userData.lover) return interaction.error("economy/divorce:NOT_MARRIED"); + const user = client.users.cache.get(data.userData.lover) || await client.users.fetch(data.userData.lover); + + data.userData.lover = null; + await data.userData.save(); + + const oldLover = await client.findOrCreateUser({ + id: user.id + }); + oldLover.lover = null; + await oldLover.save(); + + interaction.success("economy/divorce:DIVORCED", { + user: user.toString() + }); + + user.send({ + content: interaction.translate("economy/divorce:DIVORCED_U", { + user: interaction.member.toString() + }) + }); + } +} + +module.exports = Divorce; \ No newline at end of file diff --git a/commands/Economy/importmee6.js b/commands/Economy/importmee6.js new file mode 100644 index 00000000..b8998308 --- /dev/null +++ b/commands/Economy/importmee6.js @@ -0,0 +1,47 @@ +const { SlashCommandBuilder } = require("discord.js"), + { getUserXp } = require("mee6-levels-api"); +const BaseCommand = require("../../base/BaseCommand"); + +class ImportMee6 extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("importmee6") + .setDescription(client.translate("economy/importmee6:DESCRIPTION")), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const level = (await getUserXp(interaction.guildId, interaction.member.id)).level; + + data.memberData.level = level; + await data.memberData.save(); + + interaction.success("owner/debug:SUCCESS_LEVEL", { + username: interaction.member.toString(), + amount: level + }); + } +} + +module.exports = ImportMee6; \ No newline at end of file diff --git a/commands/Economy/marry.js b/commands/Economy/marry.js new file mode 100644 index 00000000..09d4a697 --- /dev/null +++ b/commands/Economy/marry.js @@ -0,0 +1,156 @@ +const { SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"), + pendings = {}; + +class Marry extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("marry") + .setDescription(client.translate("economy/marry:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + if (data.userData.lover) return interaction.error("economy/marry:ALREADY_MARRIED"); + const member = interaction.options.getMember("user"); + if (member.user.bot) return interaction.error("economy/marry:BOT_USER"); + if (member.id === interaction.member.id) return interaction.error("economy/marry:YOURSELF"); + const userData = await client.findOrCreateUser({ + id: member.id + }); + if (userData.lover) return interaction.error("economy/marry:ALREADY_MARRIED_USER", { user: member.toString() }); + + for (const requester in pendings) { + const receiver = pendings[requester]; + + if (requester === interaction.author.id) { + const user = client.users.cache.get(receiver) || await client.users.fetch(receiver); + return interaction.error("economy/marry:REQUEST_AUTHOR_TO_AMEMBER", { + user: user.toString + }); + } else if (receiver === interaction.member.id) { + const user = client.users.cache.get(requester) || await client.users.fetch(requester); + return interaction.error("economy/marry:REQUEST_AMEMBER_TO_AUTHOR", { + user: user.toString() + }); + } else if (requester === member.id) { + const user = client.users.cache.get(receiver) || await client.users.fetch(receiver); + return interaction.error("economy/marry:REQUEST_AMEMBER_TO_MEMBER", { + firstUser: member.toString(), + secondUser: user.toString() + }); + } else if (receiver === member.id) { + const user = client.users.cache.get(requester) || await client.users.fetch(requester); + return interaction.error("economy/marry:REQUEST_MEMBER_TO_AMEMBER", { + firstUser: member.toString(), + secondUser: user.toString() + }); + } + } + + pendings[interaction.member.id] = member.id; + + const row = new ActionRowBuilder() + .addComponents( + new ButtonBuilder() + .setCustomId("marry_confirm_yes") + .setLabel(interaction.translate("common:ACCEPT")) + .setStyle(ButtonStyle.Danger), + new ButtonBuilder() + .setCustomId("marry_confirm_no") + .setLabel(interaction.translate("common:CANCEL")) + .setStyle(ButtonStyle.Secondary), + ); + + + await interaction.reply({ + content: interaction.translate("economy/marry:REQUEST", { + to: member.toString(), + from: interaction.member.toString() + }), + components: [row] + }); + + const filter = i => i.user.id === member.id; + const collector = interaction.channel.createMessageComponentCollector({ filter, time: 120000 }); + + collector.on("collect", async i => { + if (i.isButton()) { + if (i.customId === "marry_confirm_yes") return collector.stop(true); + else if (i.customId === "marry_confirm_no") return collector.stop(false); + } + }); + + collector.on("end", async (_, reason) => { + delete pendings[interaction.member.id]; + if (reason === "time") return interaction.error("economy/marry:TIMEOUT"); + if (reason) { + data.userData.lover = member.id; + await data.userData.save(); + userData.lover = interaction.member.id; + await userData.save(); + + const messageOptions = { + content: `${member.toString()} :heart: ${interaction.member.toString()}`, + files: [{ + name: "achievement_unlocked3.png", + attachment: "./assets/img/achievements/achievement_unlocked3.png" + }] + }; + + let sent = false; + if (!userData.achievements.married.achieved) { + interaction.followUp(messageOptions); + sent = true; + userData.achievements.married.achieved = true; + userData.achievements.married.progress.now = 1; + userData.markModified("achievements.married"); + await userData.save(); + } + if (!data.userData.achievements.married.achieved) { + if (!sent) interaction.followUp(messageOptions); + data.userData.achievements.married.achieved = true; + data.userData.achievements.married.progress.now = 1; + data.userData.markModified("achievements.married"); + await data.userData.save(); + } + + return interaction.success("economy/marry:SUCCESS", { + creator: interaction.member.toString(), + partner: member.toString() + }); + } else { + return interaction.success("economy/marry:DENIED", { + creator: interaction.member.toString(), + partner: member.toString() + }); + } + }); + } +} + +module.exports = Marry; \ No newline at end of file diff --git a/commands/Economy/money.js b/commands/Economy/money.js new file mode 100644 index 00000000..728ec1bd --- /dev/null +++ b/commands/Economy/money.js @@ -0,0 +1,96 @@ +const { SlashCommandBuilder, EmbedBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); +const asyncForEach = async (collection, callback) => { + const allPromises = collection.map(async key => { + await callback(key); + }); + + return await Promise.all(allPromises); +}; + +class Money extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("money") + .setDescription(client.translate("economy/money:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER"))), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + await interaction.deferReply(); + const member = interaction.options.getMember("user") || interaction.member; + if (member.user.bot) return interaction.error("economy/money:BOT_USER"); + + const memberData = (member.id === interaction.user.id) ? data.memberData : await client.findOrCreateMember({ + id: member.id, + guildID: interaction.guildId + }); + + const guilds = client.guilds.cache.filter(g => g.members.cache.find(m => m.id === member.id)); + let globalMoney = 0; + await asyncForEach(guilds, async guild => { + const data = await client.findOrCreateMember({ + id: member.id, + guildID: guild.id + }); + globalMoney += data.money + data.bankSold; + }); + + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/money:TITLE", { + username: member.user.tag + }), + iconURL: member.user.displayAvatarURL() + }) + .addFields([ + { + name: interaction.translate("economy/profile:CASH"), + value: `**${memberData.money}** ${client.getNoun(memberData.money, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:BANK"), + value: `**${memberData.bankSold}** ${client.getNoun(memberData.bankSold, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:GLOBAL"), + value: `**${globalMoney}** ${client.getNoun(globalMoney, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + } + ]) + .setColor(client.config.embed.color) + .setFooter({ + text: client.config.embed.footer + }); + interaction.editReply({ + embeds: [embed] + }); + } +} + +module.exports = Money; \ No newline at end of file diff --git a/commands/Economy/number.js b/commands/Economy/number.js new file mode 100644 index 00000000..a88d2397 --- /dev/null +++ b/commands/Economy/number.js @@ -0,0 +1,116 @@ +const { SlashCommandBuilder, MessageCollector } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"), + currentGames = {}; + +class Number extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("number") + .setDescription(client.translate("economy/number:DESCRIPTION")), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + if (currentGames[interaction.guildId]) return interaction.error("economy/number:GAME_RUNNING"); + + const participants = [], + number = client.functions.randomNum(1000, 5000); + + await interaction.replyT("economy/number:GAME_START"); + + const gameCreatedAt = Date.now(); + + const filter = m => !m.author.bot; + const collector = new MessageCollector(interaction.channel, { + filter, + time: (5 * 60 * 1000) + }); + currentGames[interaction.guildId] = true; + + collector.on("collect", async msg => { + if (!participants.includes(msg.author.id)) participants.push(msg.author.id); + if (msg.content === "STOP") return collector.stop("force"); + if (isNaN(msg.content)) return; + + const parsedNumber = parseInt(msg.content, 10); + + if (parsedNumber === number) { + const time = client.convertTime(gameCreatedAt, false, false, data.guildData.language); + interaction.channel.send({ + content: interaction.translate("economy/number:GAME_STATS", { + winner: msg.author.toString(), + number, + time, + participantCount: participants.length, + participants: participants.map(p => `<@${p}>`).join(", ") + }) + }); + + if (participants.length > 1) { + const won = 100 * (participants.length * 0.5); + + interaction.channel.send({ + content: interaction.translate("economy/number:WON", { + winner: msg.author.username, + credits: `**${won}** ${client.getNoun(won, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }) + }); + + const memberData = await client.findOrCreateMember({ + id: msg.author.id, + guildID: interaction.guildId + }); + + const info = { + user: interaction.translate("economy/transactions:NUMBERS"), + amount: won, + date: Date.now(), + type: "got" + }; + + data.memberData.transactions.push(info); + + memberData.money += won; + await memberData.save(); + } + collector.stop(); + } + + if (parseInt(msg.content) < number) msg.reply({ + content: interaction.translate("economy/number:TOO_BIG", { user: msg.author.toString(), number: parsedNumber }) + }); + if (parseInt(msg.content) > number) msg.reply({ + content: interaction.translate("economy/number:TOO_SMALL", { user: msg.author.toString(), number: parsedNumber }) + }); + }); + + collector.on("end", (_collected, reason) => { + delete currentGames[interaction.guildId]; + if (reason === "time") return interaction.editReply({ content: interaction.translate("economy/number:DEFEAT", { number }) }); + else if (reason === "force") return interaction.editReply({ content: interaction.translate("misc:FORCE_STOP", { user: interaction.member.toString() }) }); + }); + } +} + +module.exports = Number; \ No newline at end of file diff --git a/commands/Economy/pay.js b/commands/Economy/pay.js new file mode 100644 index 00000000..a718d4e9 --- /dev/null +++ b/commands/Economy/pay.js @@ -0,0 +1,77 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Pay extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("pay") + .setDescription(client.translate("economy/pay:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER")) + .setRequired(true)) + .addIntegerOption(option => option.setName("amount") + .setDescription(client.translate("common:INT")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const member = interaction.options.getMember("user"); + if (member.user.bot) return interaction.error("economy/pay:BOT_USER"); + if (member.id === interaction.member.id) return interaction.error("economy/pay:YOURSELF"); + const amount = interaction.options.getInteger("amount"); + if (amount <= 0) return interaction.error("misc:MORE_THAN_ZERO"); + + + if (amount > data.memberData.money) return interaction.error("economy/pay:ENOUGH_MONEY", { + amount: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDITS:1"), interaction.translate("misc:NOUNS:CREDITS:2"), interaction.translate("misc:NOUNS:CREDITS:5"))}` + }); + + const memberData = await client.findOrCreateMember({ + id: member.id, + guildID: interaction.guildId + }); + + const info = { + user: member.user.tag, + amount: amount, + date: Date.now(), + type: "send" + }; + + data.memberData.transactions.push(info); + data.memberData.money -= amount; + await data.memberData.save(); + + memberData.money += amount; + memberData.save(); + + interaction.success("economy/pay:SUCCESS", { + user: member.toString(), + amount: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }); + } +} + +module.exports = Pay; \ No newline at end of file diff --git a/commands/Economy/profile.js b/commands/Economy/profile.js new file mode 100644 index 00000000..49d863de --- /dev/null +++ b/commands/Economy/profile.js @@ -0,0 +1,151 @@ +const { SlashCommandBuilder, EmbedBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); +const asyncForEach = async (collection, callback) => { + const allPromises = collection.map(async key => { + await callback(key); + }); + + return await Promise.all(allPromises); +}; + +class Profile extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("profile") + .setDescription(client.translate("economy/profile:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER"))), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + await interaction.deferReply(); + const member = interaction.options.getMember("user") || interaction.member; + if (member.user.bot) return interaction.error("economy/profile:BOT_USER"); + + const memberData = (member.id === interaction.user.id ? data.memberData : await client.findOrCreateMember({ + id: member.id, + guildID: interaction.guildId + })); + const userData = (member.id === interaction.user.id ? data.userData : await client.findOrCreateUser({ + id: member.id + })); + if (userData.lover && !client.users.cache.find(u => u.id === userData.lover)) await client.users.fetch(userData.lover, true); + + const guilds = client.guilds.cache.filter(g => g.members.cache.find(m => m.id === member.id)); + let globalMoney = 0; + await asyncForEach(guilds, async guild => { + const data = await client.findOrCreateMember({ + id: member.id, + guildID: guild.id + }); + globalMoney += data.money + data.bankSold; + }); + + const profileEmbed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/profile:TITLE", { + username: member.user.tag + }), + iconURL: member.displayAvatarURL() + }) + .setImage("attachment://achievements.png") + .addFields([ + { + name: client.customEmojis.link + " " + interaction.translate("economy/profile:LINK"), + value: `[${interaction.translate("economy/profile:LINK_TEXT")}](${client.config.dashboard.baseURL}/user/${member.user.id}/${interaction.guild.id})` + }, + { + name: interaction.translate("economy/profile:BIO"), + value: userData.bio ? userData.bio : interaction.translate("common:UNKNOWN") + }, + { + name: interaction.translate("economy/profile:CASH"), + value: `**${memberData.money}** ${client.getNoun(memberData.money, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:BANK"), + value: `**${memberData.bankSold}** ${client.getNoun(memberData.bankSold, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:GLOBAL"), + value: `**${globalMoney}** ${client.getNoun(globalMoney, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:REPUTATION"), + value: `**${userData.rep}** ${client.getNoun(userData.rep, interaction.translate("misc:NOUNS:POINTS:1"), interaction.translate("misc:NOUNS:POINTS:2"), interaction.translate("misc:NOUNS:POINTS:5"))}`, + inline: true + }, + { + name: interaction.translate("economy/profile:LEVEL"), + value:`**${memberData.level}**`, + inline: true + }, + { + name: interaction.translate("economy/profile:XP"), + value: `**${memberData.exp}/${5 * (memberData.level * memberData.level) + 80 * memberData.level + 100}** xp`, + inline: true + }, + { + name: interaction.translate("economy/profile:REGISTERED"), + value: client.printDate(new Date(memberData.registeredAt)), + inline: true + }, + { + name: interaction.translate("economy/profile:BIRTHDATE"), + value: (!userData.birthdate ? interaction.translate("common:NOT_DEFINED") : client.printDate(new Date(userData.birthdate))), + inline: true + }, + { + name: interaction.translate("economy/profile:LOVER"), + value: (!userData.lover ? interaction.translate("common:NOT_DEFINED") : client.users.cache.get(userData.lover).tag), + inline: true + }, + { + name: interaction.translate("economy/profile:ACHIEVEMENTS"), + value: interaction.translate("economy/profile:ACHIEVEMENTS_CONTENT") + } + ]) + .setColor(client.config.embed.color) + .setFooter({ + text: client.config.embed.footer + }) + .setTimestamp(); + + const buffer = await userData.getAchievements(); + + interaction.editReply({ + embeds: [profileEmbed], + files: [{ + name: "achievements.png", + attachment: buffer + }] + }); + } +} + +module.exports = Profile; \ No newline at end of file diff --git a/commands/Economy/rep.js b/commands/Economy/rep.js new file mode 100644 index 00000000..202946b1 --- /dev/null +++ b/commands/Economy/rep.js @@ -0,0 +1,81 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Rep extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("rep") + .setDescription(client.translate("economy/rep:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const isInCooldown = data.userData.cooldowns?.rep; + if (isInCooldown) { + if (isInCooldown > Date.now()) return interaction.error("economy/rep:COOLDOWN", { + time: client.convertTime(isInCooldown, true, true) + }); + } + + const user = interaction.options.getUser("user"); + if (user.bot) return interaction.error("economy/rep:BOT_USER"); + if (user.id === interaction.user.id) return interaction.error("economy/rep:YOURSELF"); + + const toWait = Date.now() + 21600000; // 12 hours + if (!data.userData.cooldowns) data.userData.cooldowns = {}; + data.userData.cooldowns.rep = toWait; + data.userData.markModified("cooldowns"); + await data.userData.save(); + + const userData = await client.findOrCreateUser({ + id: user.id + }); + userData.rep++; + + if (!userData.achievements.rep.achieved) { + userData.achievements.rep.progress.now = (userData.rep > userData.achievements.rep.progress.total ? userData.achievements.rep.progress.total : userData.rep); + if (userData.achievements.rep.progress.now >= userData.achievements.rep.progress.total) { + userData.achievements.rep.achieved = true; + interaction.followUp({ + content: `${user}`, + files: [{ + name: "achievement_unlocked6.png", + attachment: "./assets/img/achievements/achievement_unlocked6.png" + }] + }); + } + userData.markModified("achievements.rep"); + } + await userData.save(); + + interaction.success("economy/rep:SUCCESS", { + user: user.toString() + }); + } +} + +module.exports = Rep; \ No newline at end of file diff --git a/commands/Economy/rob.js b/commands/Economy/rob.js new file mode 100644 index 00000000..2548cddf --- /dev/null +++ b/commands/Economy/rob.js @@ -0,0 +1,94 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Rob extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("rob") + .setDescription(client.translate("economy/rob:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER")) + .setRequired(true)) + .addIntegerOption(option => option.setName("amount") + .setDescription(client.translate("common:INT")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const member = interaction.options.getMember("user"); + if (member.user.bot) return interaction.error("economy/pay:BOT_USER"); + if (member.id === interaction.member.id) return interaction.error("economy/rob:YOURSELF"); + const amount = interaction.options.getInteger("amount"); + if (amount <= 0) return interaction.error("misc:MORE_THAN_ZERO"); + + const memberData = await client.findOrCreateMember({ + id: member.id, + guildID: interaction.guildId + }); + if (amount > memberData.money) return interaction.error("economy/rob:NOT_ENOUGH_MEMBER", { user: member.toString() }); + const isInCooldown = memberData.cooldowns.rob || 0; + if (isInCooldown) { + if (isInCooldown > Date.now()) return interaction.error("economy/rob:COOLDOWN", { user: member.toString() }); + } + + const potentiallyLose = Math.floor(amount * 1.5); + if (potentiallyLose > data.memberData.money) return interaction.error("economy/rob:NOT_ENOUGH_AUTHOR", { + moneyMin: `**${potentiallyLose}** ${client.getNoun(potentiallyLose, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + moneyCurrent: `**${data.memberData.money}** ${client.getNoun(data.memberData.money, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }); + + const itsAWon = Math.floor(client.functions.randomNum(0, 100) < 25); + + if (itsAWon) { + const toWait = Date.now() + (6 * 60 * 60 * 1000); + memberData.cooldowns.rob = toWait; + memberData.markModified("cooldowns"); + await memberData.save(); + const randomNum = client.functions.randomNum(1, 2); + interaction.replyT("economy/rob:ROB_WON_" + randomNum, { + money: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + user: member.toString() + }); + data.memberData.money += amount; + memberData.money -= amount; + await memberData.save(); + await data.memberData.save(); + } else { + const won = Math.floor(amount * 0.9); + const randomNum = client.functions.randomNum(1, 2); + interaction.replyT("economy/rob:ROB_LOSE_" + randomNum, { + fine: `**${potentiallyLose}** ${client.getNoun(potentiallyLose, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + offset: `**${won}** ${client.getNoun(won, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + user: member.toString() + }); + data.memberData.money -= potentiallyLose; + memberData.money += won; + await memberData.save(); + await data.memberData.save(); + } + } +} + +module.exports = Rob; \ No newline at end of file diff --git a/commands/Economy/setbio.js b/commands/Economy/setbio.js new file mode 100644 index 00000000..ec3246e2 --- /dev/null +++ b/commands/Economy/setbio.js @@ -0,0 +1,46 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Setbio extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("setbio") + .setDescription(client.translate("economy/setbio:DESCRIPTION")) + .addStringOption(option => option.setName("text") + .setDescription(client.translate("economy/profile:BIO")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const newBio = interaction.options.getString("text"); + if (newBio.length > 150) return interaction.error("economy/setbio:MAX_CHARACTERS"); + + data.userData.bio = newBio; + await data.userData.save(); + interaction.success("economy/setbio:SUCCESS"); + } +} + +module.exports = Setbio; \ No newline at end of file diff --git a/!TO REWRITE/Economy/slots.js b/commands/Economy/slots.js similarity index 55% rename from !TO REWRITE/Economy/slots.js rename to commands/Economy/slots.js index 31fe1e4c..2b7ad7e7 100644 --- a/!TO REWRITE/Economy/slots.js +++ b/commands/Economy/slots.js @@ -1,42 +1,55 @@ -const Command = require("../../base/Command"); +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); -class Slots extends Command { +class Slots extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ constructor(client) { - super(client, { - name: "slots", + super({ + command: new SlashCommandBuilder() + .setName("slots") + .setDescription(client.translate("economy/slots:DESCRIPTION")) + .addIntegerOption(option => option.setName("amount") + .setDescription(client.translate("common:INT")) + .setRequired(true)), + aliases: [], dirname: __dirname, - enabled: true, guildOnly: true, - aliases: ["casino", "slot"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 2000 + ownerOnly: false }); } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + await interaction.deferReply(); + const amount = interaction.options.getInteger("amount"); + if (amount > data.memberData.money) return interaction.error("economy/slots:NOT_ENOUGH", { money: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` }); - 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; - // Gets three random fruits array const colonnes = [ - this.client.functions.shuffle(fruits), - this.client.functions.shuffle(fruits), - this.client.functions.shuffle(fruits) + client.functions.shuffle(fruits), + client.functions.shuffle(fruits), + client.functions.shuffle(fruits) ]; - // 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"))}` }); - - amount = Math.round(amount); - function getCredits(number, isJackpot) { if (!isJackpot) number = number * 1.5; else if (isJackpot) number = number * 5; @@ -44,16 +57,13 @@ class Slots extends Command { return Math.round(number); } - const tmsg = await message.sendT("misc:PLEASE_WAIT", null, { - prefixEmoji: "loading" - }); editMsg(); const interval = setInterval(editMsg, 1000); setTimeout(() => { clearInterval(interval); - end(tmsg); + end(); }, 4000); async function end() { @@ -74,34 +84,36 @@ class Slots extends Command { msg += colonnes[0][i3] + " : " + colonnes[1][j3] + " : " + colonnes[2][k3] + "\n------------------\n"; if ((colonnes[0][i2] == colonnes[1][j2]) && (colonnes[1][j2] == colonnes[2][k2])) { - msg += "| : : : **" + (message.translate("common:VICTORY").toUpperCase()) + "** : : : |"; - tmsg.edit(msg); + msg += "| : : : **" + (interaction.translate("common:VICTORY").toUpperCase()) + "** : : : |"; + await interaction.editReply({ + content: msg + }); + const credits = getCredits(amount, true); - message.channel.send({ - content: "**!! ДЖЕКПОТ !!**\n" + message.translate("economy/slots:VICTORY", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - won: `**${credits}** ${message.getNoun(credits, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - username: message.author.username + interaction.followUp({ + content: "**!! ДЖЕКПОТ !!**\n" + interaction.translate("economy/slots:VICTORY", { + money: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + won: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + user: interaction.member.toString() }) }); const toAdd = credits - amount; const info = { - user: message.translate("economy/slots:DESCRIPTION"), + user: interaction.translate("economy/slots:DESCRIPTION"), amount: toAdd, date: Date.now(), type: "got" }; - data.memberData.transactions.push(info); + data.memberData.money += toAdd; - data.memberData.money = data.memberData.money + toAdd; if (!data.userData.achievements.slots.achieved) { data.userData.achievements.slots.progress.now += 1; if (data.userData.achievements.slots.progress.now === data.userData.achievements.slots.progress.total) { data.userData.achievements.slots.achieved = true; - message.reply({ + interaction.followUp({ files: [{ name: "achievement_unlocked4.png", attachment: "./assets/img/achievements/achievement_unlocked4.png" @@ -116,33 +128,35 @@ class Slots extends Command { } if (colonnes[0][i2] == colonnes[1][j2] || colonnes[1][j2] == colonnes[2][k2] || colonnes[0][i2] == colonnes[2][k2]) { - msg += "| : : : **" + (message.translate("common:VICTORY").toUpperCase()) + "** : : : |"; - tmsg.edit(msg); + msg += "| : : : **" + (interaction.translate("common:VICTORY").toUpperCase()) + "** : : : |"; + await interaction.editReply({ + content: msg + }); + const credits = getCredits(amount, false); - message.channel.send({ - content: message.translate("economy/slots:VICTORY", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - won: `**${credits}** ${message.getNoun(credits, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - username: message.author.username + interaction.followUp({ + content: interaction.translate("economy/slots:VICTORY", { + money: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + won: `**${credits}** ${client.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + user: interaction.member.toString() }) }); const toAdd = credits - amount; const info = { - user: message.translate("economy/slots:DESCRIPTION"), + user: interaction.translate("economy/slots:DESCRIPTION"), amount: toAdd, date: Date.now(), type: "got" }; - data.memberData.transactions.push(info); + data.memberData.money += toAdd; - data.memberData.money = data.memberData.money + toAdd; if (!data.userData.achievements.slots.achieved) { data.userData.achievements.slots.progress.now += 1; if (data.userData.achievements.slots.progress.now === data.userData.achievements.slots.progress.total) { data.userData.achievements.slots.achieved = true; - message.reply({ + interaction.followUp({ files: [{ name: "achievement_unlocked4.png", attachment: "./assets/img/achievements/achievement_unlocked4.png" @@ -156,24 +170,23 @@ class Slots extends Command { return; } - msg += "| : : : **" + (message.translate("common:DEFEAT").toUpperCase()) + "** : : : |"; - message.channel.send({ - content: message.translate("economy/slots:DEFEAT", { - money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, - username: message.author.username + msg += "| : : : **" + (interaction.translate("common:DEFEAT").toUpperCase()) + "** : : : |"; + interaction.followUp({ + content: interaction.translate("economy/slots:DEFEAT", { + money: `**${amount}** ${client.getNoun(amount, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}`, + user: interaction.member.toString() }) }); const info = { - user: message.translate("economy/slots:DESCRIPTION"), + user: interaction.translate("economy/slots:DESCRIPTION"), amount: amount, date: Date.now(), type: "send" }; - data.memberData.transactions.push(info); + data.memberData.money -= amount; - data.memberData.money = data.memberData.money - amount; if (!data.userData.achievements.slots.achieved) { data.userData.achievements.slots.progress.now = 0; data.userData.markModified("achievements.slots"); @@ -183,7 +196,7 @@ class Slots extends Command { return; } - function editMsg() { + async function editMsg() { let msg = "[ :slot_machine: | **СЛОТЫ** ]\n------------------\n"; i1 = (i1 < fruits.length - 1) ? i1 + 1 : 0; @@ -200,7 +213,9 @@ class Slots extends Command { msg += colonnes[0][i2] + " : " + colonnes[1][j2] + " : " + colonnes[2][k2] + " **<**\n"; msg += colonnes[0][i3] + " : " + colonnes[1][j3] + " : " + colonnes[2][k3] + "\n"; - tmsg.edit(msg); + await interaction.editReply({ + content: msg + }); } } } diff --git a/commands/Economy/tictactoe.js b/commands/Economy/tictactoe.js new file mode 100644 index 00000000..06c9cc52 --- /dev/null +++ b/commands/Economy/tictactoe.js @@ -0,0 +1,62 @@ +const { SlashCommandBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"), + tictactoe = require("../../helpers/tictactoe"); + +class TicTacToe extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("tictactoe") + .setDescription(client.translate("economy/tictactoe:DESCRIPTION")) + .addUserOption(option => option.setName("user") + .setDescription(client.translate("common:USER")) + .setRequired(true)), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction) { + tictactoe(interaction, { + resultBtn: true, + embedColor: client.config.embed.color, + embedFoot: client.config.embed.footer + }).then(async winner => { + const memberData = await client.findOrCreateMember({ + id: winner.id, + guildID: interaction.guildId + }); + + const info = { + user: interaction.translate("economy/transactions:TTT"), + amount: 100, + date: Date.now(), + type: "got" + }; + memberData.transactions.push(info); + + memberData.money += 100; + await memberData.save(); + }); + } +} + +module.exports = TicTacToe; \ No newline at end of file diff --git a/commands/Economy/transactions.js b/commands/Economy/transactions.js new file mode 100644 index 00000000..bdc3c713 --- /dev/null +++ b/commands/Economy/transactions.js @@ -0,0 +1,77 @@ +const { SlashCommandBuilder, EmbedBuilder } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Transactions extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("transactions") + .setDescription(client.translate("economy/transactions:DESCRIPTION")), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const embed = new EmbedBuilder() + .setAuthor({ + name: interaction.translate("economy/transactions:EMBED_TRANSACTIONS"), + iconURL: interaction.member.displayAvatarURL() + }) + .setColor(client.config.embed.color) + .setFooter({ + text: client.config.embed.footer + }); + + const transactions = data.memberData.transactions, + sortedTransactions = [ [], [] ]; + + transactions.slice(-20).forEach(t => { + const array = t.type === "got" ? sortedTransactions[0] : sortedTransactions[1]; + array.push(`${interaction.translate("economy/transactions:T_USER_" + t.type.toUpperCase())}: ${t.user}\n${interaction.translate("economy/transactions:T_AMOUNT")}: ${t.amount}\n${interaction.translate("economy/transactions:T_DATE")}: ${client.printDate(t.date, "Do MMMM YYYY, HH:mm", data.guildData.language)}\n`); + }); + + if (transactions.length < 1) { + embed.setDescription(interaction.translate("economy/transactions:NO_TRANSACTIONS")); + } else { + if (sortedTransactions[0].length > 0) embed.addFields([ + { + name: interaction.translate("economy/transactions:T_GOT"), + value: sortedTransactions[0].join("\n"), + inline: true + } + ]); + if (sortedTransactions[1].length > 0) embed.addFields([ + { + name: interaction.translate("economy/transactions:T_SEND"), + value: sortedTransactions[1].join("\n"), + inline: true + } + ]); + } + + interaction.reply({ + embeds: [embed] + }); + } +} + +module.exports = Transactions; \ No newline at end of file diff --git a/commands/Economy/work.js b/commands/Economy/work.js new file mode 100644 index 00000000..2a1d475a --- /dev/null +++ b/commands/Economy/work.js @@ -0,0 +1,132 @@ +const { SlashCommandBuilder, EmbedBuilder, parseEmoji } = require("discord.js"); +const BaseCommand = require("../../base/BaseCommand"); + +class Work extends BaseCommand { + /** + * + * @param {import("../base/JaBa")} client + */ + constructor(client) { + super({ + command: new SlashCommandBuilder() + .setName("work") + .setDescription(client.translate("economy/work:DESCRIPTION")), + aliases: [], + dirname: __dirname, + guildOnly: true, + ownerOnly: false + }); + } + /** + * + * @param {import("../../base/JaBa")} client + */ + async onLoad() { + //... + } + /** + * + * @param {import("../../base/JaBa")} client + * @param {import("discord.js").ChatInputCommandInteraction} interaction + * @param {Object} data + */ + async execute(client, interaction, data) { + const isInCooldown = data.memberData.cooldowns?.work; + if (isInCooldown) { + if (isInCooldown > Date.now()) return interaction.error("economy/work:COOLDOWN", { + time: client.convertTime(isInCooldown, true, true) + }); + } + if (Date.now() > data.memberData.cooldowns.work + (24 * 3600000)) data.memberData.workStreak = 0; + + const toWait = Date.now() + 43200000; // 24 hours + data.memberData.cooldowns.work = toWait; + data.memberData.markModified("cooldowns"); + + data.memberData.workStreak = (data.memberData.workStreak || 0) + 1; + await data.memberData.save(); + + const embed = new EmbedBuilder() + .setFooter({ + text: interaction.translate("economy/work:AWARD"), + iconURL: interaction.member.displayAvatarURL() + }) + .setColor(client.config.embed.color); + + const award = [ + client.customEmojis.letters.a, + client.customEmojis.letters.w, + client.customEmojis.letters.a, + client.customEmojis.letters.r, + client.customEmojis.letters.d + ]; + let won = 200; + + if (data.memberData.workStreak >= 5) { + won += 200; + embed.addFields([ + { + name: interaction.translate("economy/work:SALARY"), + value: interaction.translate("economy/work:SALARY_CONTENT", { + won: `**${won}** ${client.getNoun(won, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }) + }, + { + name: interaction.translate("economy/work:STREAK"), + value: interaction.translate("economy/work:STREAK_CONTENT") + } + ]); + data.memberData.workStreak = 0; + } else { + for (let i = 0; i < award.length; i++) { + if (data.memberData.workStreak > i) { + const letter = parseEmoji(award[i]).name.split("_")[1]; + award[i] = `:regional_indicator_${letter.toLowerCase()}:`; + } + } + embed.addFields([ + { + name: interaction.translate("economy/work:SALARY"), + value: interaction.translate("economy/work:SALARY_CONTENT", { + won: `**${won}** ${client.getNoun(won, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` + }) + }, + { + name: interaction.translate("economy/work:STREAK"), + value: award.join("") + } + ]); + } + + const info = { + user: interaction.translate("economy/work:SALARY"), + amount: won, + date: Date.now(), + type: "got" + }; + + data.memberData.transactions.push(info); + data.memberData.money += won; + await data.memberData.save(); + + const messageOptions = { + embeds: [embed] + }; + if (!data.userData.achievements.work.achieved) { + data.userData.achievements.work.progress.now += 1; + if (data.userData.achievements.work.progress.now === data.userData.achievements.work.progress.total) { + messageOptions.files = [{ + name: "unlocked.png", + attachment: "./assets/img/achievements/achievement_unlocked1.png" + }]; + data.userData.achievements.work.achieved = true; + } + data.userData.markModified("achievements.work"); + await data.userData.save(); + } + + interaction.reply(messageOptions); + } +} + +module.exports = Work; \ No newline at end of file diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js index db98900c..771170c8 100644 --- a/commands/Fun/8ball.js +++ b/commands/Fun/8ball.js @@ -32,7 +32,7 @@ class Eightball extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply(); diff --git a/commands/Fun/lmgtfy.js b/commands/Fun/lmgtfy.js index 7a17b6d4..c84edeaa 100644 --- a/commands/Fun/lmgtfy.js +++ b/commands/Fun/lmgtfy.js @@ -32,7 +32,7 @@ class LMGTFY extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const question = interaction.options.getString("question").replace(/[' '_]/g, "+"); diff --git a/commands/Fun/lovecalc.js b/commands/Fun/lovecalc.js index b01566f7..a5d41144 100644 --- a/commands/Fun/lovecalc.js +++ b/commands/Fun/lovecalc.js @@ -36,7 +36,7 @@ class Lovecalc extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const firstMember = interaction.options.getMember("first_member"); diff --git a/commands/Fun/memes.js b/commands/Fun/memes.js index c274a754..603c5ec7 100644 --- a/commands/Fun/memes.js +++ b/commands/Fun/memes.js @@ -29,7 +29,7 @@ class Memes extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const tags = ["memes", "dankmemes", "me_irl", "wholesomememes"].map(tag => diff --git a/commands/General/activity.js b/commands/General/activity.js index 49c5a865..5fa09154 100644 --- a/commands/General/activity.js +++ b/commands/General/activity.js @@ -29,7 +29,7 @@ class Activity extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; @@ -74,7 +74,7 @@ class Activity extends BaseCommand { const embed = new EmbedBuilder() .setTitle(activity) .setColor(client.config.embed.color) - .setDescription(`**[${interaction.translate("misc:CLICK_HERE", { activity: defaultApplications.find(a => a.id === activity).name, channel: voice.name })}](${invite.code})**`) + .setDescription(`**[${interaction.translate("general/activity:CLICK_HERE", { activity: defaultApplications.find(a => a.id === activity).name, channel: voice.name })}](${invite.code})**`) .setFooter({ text: client.config.embed.footer }) diff --git a/commands/General/afk.js b/commands/General/afk.js index 017fb03b..9a762d3f 100644 --- a/commands/General/afk.js +++ b/commands/General/afk.js @@ -31,7 +31,7 @@ class Afk extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const reason = interaction.options.getString("message"); diff --git a/commands/General/avatar.js b/commands/General/avatar.js index 8f86ccb1..63f7ca6d 100644 --- a/commands/General/avatar.js +++ b/commands/General/avatar.js @@ -30,7 +30,7 @@ class Avatar extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const user = interaction.options.getUser("user") || interaction.user; diff --git a/commands/General/emoji.js b/commands/General/emoji.js index 0743f068..7cb6b314 100644 --- a/commands/General/emoji.js +++ b/commands/General/emoji.js @@ -31,7 +31,7 @@ class Emoji extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const rawEmoji = interaction.options.getString("emoji"); @@ -49,7 +49,7 @@ class Emoji extends BaseCommand { }) .addFields([ { - name: interaction.translate("general/emoji:NAME"), + name: interaction.translate("common:NAME"), value: parsedEmoji.name }, { diff --git a/commands/General/help.js b/commands/General/help.js index f4417603..7c5e394c 100644 --- a/commands/General/help.js +++ b/commands/General/help.js @@ -31,7 +31,7 @@ class Help extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const commands = [...new Map(client.commands.map(v => [v.constructor.name, v])).values()]; diff --git a/commands/General/minecraft.js b/commands/General/minecraft.js index 95666476..5994278b 100644 --- a/commands/General/minecraft.js +++ b/commands/General/minecraft.js @@ -32,7 +32,7 @@ class Minecraft extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply(); diff --git a/commands/General/ping.js b/commands/General/ping.js index 8884393d..32adcf23 100644 --- a/commands/General/ping.js +++ b/commands/General/ping.js @@ -28,7 +28,7 @@ class Ping extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { interaction.replyT("general/ping:CONTENT", { diff --git a/commands/General/remindme.js b/commands/General/remindme.js index 10ef342a..d2ca5451 100644 --- a/commands/General/remindme.js +++ b/commands/General/remindme.js @@ -35,7 +35,7 @@ class Remindme extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const time = interaction.options.getString("time"); diff --git a/commands/General/report.js b/commands/General/report.js index fb5d81f2..1fde346f 100644 --- a/commands/General/report.js +++ b/commands/General/report.js @@ -34,7 +34,7 @@ class Report extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const repChannel = interaction.guild.channels.cache.get(interaction.guild.data.plugins.reports); diff --git a/commands/General/serverinfo.js b/commands/General/serverinfo.js index 5c78e96e..7a39b8c5 100644 --- a/commands/General/serverinfo.js +++ b/commands/General/serverinfo.js @@ -28,7 +28,7 @@ class Serverinfo extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const guild = interaction.guild; diff --git a/commands/General/shorturl.js b/commands/General/shorturl.js index f27110a4..3dd724b5 100644 --- a/commands/General/shorturl.js +++ b/commands/General/shorturl.js @@ -32,7 +32,7 @@ class Shorturl extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const url = interaction.options.getString("url"); diff --git a/commands/General/staff.js b/commands/General/staff.js index 1429ec11..a9947193 100644 --- a/commands/General/staff.js +++ b/commands/General/staff.js @@ -28,7 +28,7 @@ class Staff extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.guild.members.fetch(); diff --git a/commands/General/stats.js b/commands/General/stats.js index 9aaab6a8..f8095a07 100644 --- a/commands/General/stats.js +++ b/commands/General/stats.js @@ -29,7 +29,7 @@ class Stats extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const hiddenGuild = await client.guilds.fetch("568120814776614924"); diff --git a/commands/General/suggest.js b/commands/General/suggest.js index 88593755..77ec155c 100644 --- a/commands/General/suggest.js +++ b/commands/General/suggest.js @@ -31,7 +31,7 @@ class Suggest extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const suggChannel = interaction.guild.channels.cache.get(interaction.guild.data.plugins.suggestions); @@ -43,9 +43,7 @@ class Suggest extends BaseCommand { name: interaction.translate("general/suggest:TITLE", { user: interaction.user.tag }), - iconURL: interaction.member.displayAvatarURL({ - size: 512 - }) + iconURL: interaction.member.displayAvatarURL() }) .addFields([ { diff --git a/commands/General/userinfo.js b/commands/General/userinfo.js index b75c9ca0..112fbe1e 100644 --- a/commands/General/userinfo.js +++ b/commands/General/userinfo.js @@ -30,16 +30,14 @@ class Userinfo extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const member = interaction.options.getMember("user") || interaction.member; const embed = new EmbedBuilder() .setAuthor({ name: `${member.user.tag} (${member.id})`, - iconURL: member.displayAvatarURL({ - size: 512 - }) + iconURL: member.displayAvatarURL() }) .setThumbnail(member.displayAvatarURL({ size: 512 @@ -71,7 +69,7 @@ class Userinfo extends BaseCommand { inline: true }, { - name: client.customEmojis.calendar2 + " " + interaction.translate("common:JOIN"), + name: client.customEmojis.calendar2 + " " + interaction.translate("common:JOINED"), value: client.printDate(member.joinedAt), inline: true }, diff --git a/commands/General/whois.js b/commands/General/whois.js index 21a7fe52..db9f9740 100644 --- a/commands/General/whois.js +++ b/commands/General/whois.js @@ -32,7 +32,7 @@ class Whois extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply(); diff --git a/commands/Moderation/clear.js b/commands/Moderation/clear.js index f7057833..10ab0895 100644 --- a/commands/Moderation/clear.js +++ b/commands/Moderation/clear.js @@ -33,7 +33,7 @@ class Clear extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const option = interaction.options.getString("option"); @@ -84,7 +84,7 @@ class Clear extends BaseCommand { } }); } else { - if (isNaN(option) || parseInt(option) < 1) return interaction.error("moderation/clear:OPTION_NAN", null, { ephemeral: true }); + if (isNaN(option) || parseInt(option) < 1) return interaction.error("misc:OPTION_NAN_ALL", null, { ephemeral: true }); let messages = await interaction.channel.messages.fetch({ limit: option }); @@ -95,12 +95,12 @@ class Clear extends BaseCommand { if (member) { interaction.replyT("moderation/clear:CLEARED_MEMBER", { - amount: `${option} ${client.getNoun(option, interaction.translate("misc:NOUNS:MESSAGES:1"), interaction.translate("misc:NOUNS:MESSAGES:2"), interaction.translate("misc:NOUNS:MESSAGES:5"))}`, + amount: `**${option}** ${client.getNoun(option, interaction.translate("misc:NOUNS:MESSAGES:1"), interaction.translate("misc:NOUNS:MESSAGES:2"), interaction.translate("misc:NOUNS:MESSAGES:5"))}`, username: member.user.tag }, { ephemeral: true }); } else { interaction.replyT("moderation/clear:CLEARED", { - amount: `${option} ${client.getNoun(option, interaction.translate("misc:NOUNS:MESSAGES:1"), interaction.translate("misc:NOUNS:MESSAGES:2"), interaction.translate("misc:NOUNS:MESSAGES:5"))}` + amount: `**${option}** ${client.getNoun(option, interaction.translate("misc:NOUNS:MESSAGES:1"), interaction.translate("misc:NOUNS:MESSAGES:2"), interaction.translate("misc:NOUNS:MESSAGES:5"))}` }, { ephemeral: true }); } } diff --git a/commands/Moderation/clearwarns.js b/commands/Moderation/clearwarns.js index 358d3d42..bdde63e3 100644 --- a/commands/Moderation/clearwarns.js +++ b/commands/Moderation/clearwarns.js @@ -31,7 +31,7 @@ class Clearwarns extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const member = interaction.options.getMember("user"); diff --git a/commands/Moderation/giveaway.js b/commands/Moderation/giveaway.js index c70d5de9..5537d678 100644 --- a/commands/Moderation/giveaway.js +++ b/commands/Moderation/giveaway.js @@ -39,7 +39,7 @@ class Giveaway extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const options = ["create", "reroll", "delete", "end"].map(tag => diff --git a/commands/Moderation/poll.js b/commands/Moderation/poll.js index 84743d46..6a131c2e 100644 --- a/commands/Moderation/poll.js +++ b/commands/Moderation/poll.js @@ -31,7 +31,7 @@ class Poll extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const question = interaction.options.getString("question"); @@ -40,11 +40,11 @@ class Poll extends BaseCommand { .addComponents( new ButtonBuilder() .setCustomId("poll_everyone") - .setLabel(interaction.translate("moderation/poll:EVERYONE")) + .setLabel("@everyone") .setStyle(ButtonStyle.Primary), new ButtonBuilder() .setCustomId("poll_here") - .setLabel(interaction.translate("moderation/poll:HERE")) + .setLabel("@here") .setStyle(ButtonStyle.Primary), new ButtonBuilder() .setCustomId("poll_nothing") @@ -70,13 +70,13 @@ class Poll extends BaseCommand { collector.on("collect", async i => { if (i.isButton()) { if (i.customId === "poll_everyone") { - mention = "@everyone"; + mention = "||@everyone||"; i.update({ content: interaction.translate("moderation/poll:POLL_SENDED"), components: [] }); } else if (i.customId === "poll_here") { - mention = "@here"; + mention = "||@here||"; i.update({ content: interaction.translate("moderation/poll:POLL_SENDED"), components: [] diff --git a/commands/Moderation/unban.js b/commands/Moderation/unban.js index 9f640c96..11d7b9b4 100644 --- a/commands/Moderation/unban.js +++ b/commands/Moderation/unban.js @@ -31,7 +31,7 @@ class Unban extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const id = interaction.options.getString("user_id"); diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js index c8cf6145..67501e13 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -28,7 +28,7 @@ class Warn extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").UserContextMenuCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction, data) { const member = interaction.targetMember; @@ -164,7 +164,7 @@ class Warn extends BaseCommand { submitted.reply({ content: interaction.translate("moderation/warn:WARNED", { - username: member.user.tag, + user: member.toString(), reason }) }); diff --git a/commands/Moderation/warns.js b/commands/Moderation/warns.js index 7e0425c0..19124397 100644 --- a/commands/Moderation/warns.js +++ b/commands/Moderation/warns.js @@ -31,7 +31,7 @@ class Warns extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const member = interaction.options.getMember("user"); diff --git a/commands/Music/back.js b/commands/Music/back.js index 2e2ee271..d62c1b75 100644 --- a/commands/Music/back.js +++ b/commands/Music/back.js @@ -28,7 +28,7 @@ class Back extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/Music/clips.js b/commands/Music/clips.js index 98072106..0be17635 100644 --- a/commands/Music/clips.js +++ b/commands/Music/clips.js @@ -30,7 +30,7 @@ class Clips extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { fs.readdir("./clips", async function (err, files) { diff --git a/commands/Music/loop.js b/commands/Music/loop.js index bbc27c2e..ce7e7ab5 100644 --- a/commands/Music/loop.js +++ b/commands/Music/loop.js @@ -29,7 +29,7 @@ class Loop extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/Music/nowplaying.js b/commands/Music/nowplaying.js index 455eb0c8..ba0eec37 100644 --- a/commands/Music/nowplaying.js +++ b/commands/Music/nowplaying.js @@ -29,7 +29,7 @@ class Nowplaying extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply(); diff --git a/commands/Music/play.js b/commands/Music/play.js index 8640b8e3..8f64216e 100644 --- a/commands/Music/play.js +++ b/commands/Music/play.js @@ -32,7 +32,7 @@ class Play extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply(); diff --git a/commands/Music/queue.js b/commands/Music/queue.js index 10bf8454..ac8535f5 100644 --- a/commands/Music/queue.js +++ b/commands/Music/queue.js @@ -28,7 +28,7 @@ class Queue extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const queue = client.player.getQueue(interaction.guildId); diff --git a/commands/Music/skip.js b/commands/Music/skip.js index 8b18b2fb..2a671739 100644 --- a/commands/Music/skip.js +++ b/commands/Music/skip.js @@ -28,7 +28,7 @@ class Skip extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/Music/skipto.js b/commands/Music/skipto.js index 8ea9450f..96bcea7d 100644 --- a/commands/Music/skipto.js +++ b/commands/Music/skipto.js @@ -31,7 +31,7 @@ class Skipto extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/Music/stop.js b/commands/Music/stop.js index f3b2dafa..96e670d5 100644 --- a/commands/Music/stop.js +++ b/commands/Music/stop.js @@ -28,7 +28,7 @@ class Stop extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const voice = interaction.member.voice.channel; diff --git a/commands/NSFW/nsfw.js b/commands/NSFW/nsfw.js index 92e6dde5..523e5735 100644 --- a/commands/NSFW/nsfw.js +++ b/commands/NSFW/nsfw.js @@ -29,7 +29,7 @@ class NSFW extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { if (!interaction.channel.nsfw) return interaction.replyT("misc:NSFW_COMMAND", null, { ephemeral: true }); diff --git a/commands/Owner/announcement.js b/commands/Owner/announcement.js index e41c3579..f4bf9bc9 100644 --- a/commands/Owner/announcement.js +++ b/commands/Owner/announcement.js @@ -13,6 +13,9 @@ class Announcement extends BaseCommand { .setDescription(client.translate("owner/announcement:DESCRIPTION")) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) + .setRequired(true)) + .addBooleanOption(option => option.setName("tag") + .setDescription(client.translate("owner/announcement:TAG")) .setRequired(true)), aliases: [], dirname: __dirname, @@ -31,7 +34,7 @@ class Announcement extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply({ ephemeral: true }); @@ -53,7 +56,7 @@ class Announcement extends BaseCommand { if (guild.id === "568120814776614924") return; const channel = guild.channels.cache.get(guild?.data.plugins.news); await channel.send({ - content: "||@everyone|| ВАЖНОЕ ОБЪЯВЛЕНИЕ!", + content: `${interaction.options.getBoolean("tag") ? "||@everyone|| " : ""}ВАЖНОЕ ОБЪЯВЛЕНИЕ!`, embeds: [embed] }); }); diff --git a/commands/Owner/debug.js b/commands/Owner/debug.js index b5c11f04..20c6e6ab 100644 --- a/commands/Owner/debug.js +++ b/commands/Owner/debug.js @@ -21,7 +21,7 @@ class Debug extends BaseCommand { { name: client.translate("common:XP"), value: "xp" }, { name: client.translate("common:CREDITS"), value: "credits" }, { name: client.translate("economy/transactions:BANK"), value: "bank" }, - { name: client.translate("common:REP"), value: "rep" }, + { name: client.translate("common:REP"), value: "rep" } )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) @@ -40,7 +40,7 @@ class Debug extends BaseCommand { { name: client.translate("common:XP"), value: "xp" }, { name: client.translate("common:CREDITS"), value: "credits" }, { name: client.translate("economy/transactions:BANK"), value: "bank" }, - { name: client.translate("common:REP"), value: "rep" }, + { name: client.translate("common:REP"), value: "rep" } )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) @@ -68,56 +68,62 @@ class Debug extends BaseCommand { * @param {import("discord.js").ChatInputCommandInteraction} interaction * @param {Array} data */ - async execute(client, interaction, data) { + async execute(client, interaction,) { const command = interaction.options.getSubcommand(); if (command === "set") { const type = interaction.options.getString("type"); const member = interaction.options.getMember("user"); if (member.user.bot) return interaction.error("misc:BOT_USER", null, { ephemeral: true }); + const userData = await client.findOrCreateUser({ + id: member.id + }); + const memberData = await client.findOrCreateMember({ + id: member.id + }); const int = interaction.options.getInteger("int"); switch (type) { case "level": { - data.memberData.level = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.level = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "xp": { - data.memberData.exp = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.exp = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "credits": { - data.memberData.money = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.money = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "bank": { - data.memberData.bankSold = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.bankSold = int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "rep": { - data.memberData.rep = int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + userData.rep = int; + await userData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); @@ -127,49 +133,55 @@ class Debug extends BaseCommand { const type = interaction.options.getString("type"); const member = interaction.options.getMember("target"); if (member.user.bot) return interaction.error("misc:BOT_USER", null, { ephemeral: true }); + const userData = await client.findOrCreateUser({ + id: member.id + }); + const memberData = await client.findOrCreateMember({ + id: member.id + }); const int = interaction.options.getInteger("int"); switch (type) { case "level": { - data.memberData.level += int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.level += int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "xp": { - data.memberData.exp += int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.exp += int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "credits": { - data.memberData.money += int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.money += int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "bank": { - data.memberData.bankSold += int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + memberData.bankSold += int; + await memberData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); } case "rep": { - data.memberData.rep += int; - await data.memberData.save(); - return interaction.success("owner/debug:SUCCESS_" + type.toUpperCase(), { + userData.rep += int; + await userData.save(); + return interaction.success(`owner/debug:SUCCESS_${type.toUpperCase()}`, { username: member.toString(), amount: int }, { ephemeral: true }); diff --git a/commands/Owner/eval.js b/commands/Owner/eval.js index 505c187e..f5113a6c 100644 --- a/commands/Owner/eval.js +++ b/commands/Owner/eval.js @@ -31,14 +31,14 @@ class Eval extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ // eslint-disable-next-line no-unused-vars async execute(client, interaction, data) { const code = interaction.options.getString("code"); - const result = new Promise((resolve) => resolve(eval(code))); + const result = new Promise(resolve => resolve(eval(code))); - return result.then((output) => { + return result.then(output => { if (typeof output != "string") output = require("util").inspect(output, { depth: 0 }); if (output.includes(client.token)) output = output.replace(client.token, "T0K3N"); @@ -46,7 +46,7 @@ class Eval extends BaseCommand { content: "```js\n" + output + "```", ephemeral: true }); - }).catch((err) => { + }).catch(err => { console.error(err); err = err.toString(); diff --git a/commands/Owner/reload.js b/commands/Owner/reload.js index 2f1fa425..7eb020f4 100644 --- a/commands/Owner/reload.js +++ b/commands/Owner/reload.js @@ -33,12 +33,12 @@ class Reload extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { const command = interaction.options.getString("command"); const cmd = client.commands.get(command); - if (!cmd) return interaction.error("general/help:NOT_FOUND", { search: command }, { ephemeral: true }); + if (!cmd) return interaction.error("owner/reload:NOT_FOUND", { search: command }, { ephemeral: true }); await client.unloadCommand(`../commands/${cmd.category}`, cmd.command.name); await client.loadCommand(`../commands/${cmd.category}`, cmd.command.name); diff --git a/commands/Owner/say.js b/commands/Owner/say.js index 68ce38e5..41df8370 100644 --- a/commands/Owner/say.js +++ b/commands/Owner/say.js @@ -33,7 +33,7 @@ class Say extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { await interaction.deferReply({ ephemeral: true }); diff --git a/commands/Owner/servers.js b/commands/Owner/servers.js index cc2d34dc..53e46b8f 100644 --- a/commands/Owner/servers.js +++ b/commands/Owner/servers.js @@ -28,7 +28,7 @@ class Servers extends BaseCommand { * * @param {import("../../base/JaBa")} client * @param {import("discord.js").ChatInputCommandInteraction} interaction - * @param {Array} data + * @param {Object} data */ async execute(client, interaction) { let i0 = 0, diff --git a/dashboard/public/docs/updates.md b/dashboard/public/docs/updates.md index 42c2c568..bb52c927 100644 --- a/dashboard/public/docs/updates.md +++ b/dashboard/public/docs/updates.md @@ -1,3 +1,16 @@ +### JaBa v4.0 +* Добавлено + * Перенесены все категории. + * Команда *setnews* - настроить канал для новостей бота (только самые важные). + * Настройка канала новостей бота в панели управления. + +* Изменения + * Команды *deposit* и *withdraw* заменены командой *bank*. + +* Исправления + * Поправлены все фразы в стандартной локализации. + * Правка локализации в панели управления. + ### JaBa v4.0pre5 * Добавлено * Перенесена категория *Administration*. diff --git a/dashboard/views/manager/guild.ejs b/dashboard/views/manager/guild.ejs index e3a9b467..e5f0f14a 100644 --- a/dashboard/views/manager/guild.ejs +++ b/dashboard/views/manager/guild.ejs @@ -18,7 +18,7 @@
-

<%= translate("common:CONFIGURATION") %> Dashboard v1.1

+

<%= translate("common:SETTINGS") %> Dashboard v1.1

  1. <%= translate("dashboard:SELECTOR") %>
  2. <%= guild.name %>
    3. @@ -44,7 +44,7 @@
    - <%= translate("economy/profile:EXP").substr(2) %> + <%= translate("economy/profile:XP").substr(2) %> <%= memberData.exp %> / <%= 5 * (memberData.level * memberData.level) + 80 * memberData.level + 100 %>
    @@ -115,7 +115,7 @@
    + class="btn btn-primary"><%= translate("common:APPLY") %>
    @@ -223,7 +223,7 @@
    + class="btn btn-primary"><%= translate("common:APPLY") %>
    @@ -283,12 +283,12 @@
    <% if (guild.plugins.welcome.enabled) { %> + class="btn btn-danger"><%= translate("common:DISABLE") %> + class="btn btn-primary pull-right"><%= translate("common:APPLY") %> <% } else { %> + class="btn btn-success"><%= translate("common:ENABLE") %> <% } %>
    @@ -346,12 +346,12 @@
    <% if (guild.plugins.goodbye.enabled) { %> + class="btn btn-danger"><%= translate("common:DISABLE") %> + class="btn btn-primary pull-right"><%= translate("common:APPLY") %> <% } else { %> + class="btn btn-success"><%= translate("common:ENABLE") %> <% } %>
    @@ -388,12 +388,12 @@
    <% if (guild.plugins.autorole.enabled) { %> + class="btn btn-danger"><%= translate("common:DISABLE") %> + class="btn btn-primary pull-right"><%= translate("common:APPLY") %> <% } else { %> + class="btn btn-success"><%= translate("common:ENABLE") %> <% } %>
    diff --git a/dashboard/views/profile.ejs b/dashboard/views/profile.ejs index 4ccaad3b..6197a42d 100644 --- a/dashboard/views/profile.ejs +++ b/dashboard/views/profile.ejs @@ -84,7 +84,7 @@
    -

    <%= translate("common:CONFIGURATION") %>

    +

    <%= translate("common:SETTINGS") %>

    @@ -116,7 +116,7 @@
    + class="btn btn-primary"><%= translate("common:APPLY") %>
    diff --git a/dashboard/views/stats/guild.ejs b/dashboard/views/stats/guild.ejs index 37281c9c..73be8623 100644 --- a/dashboard/views/stats/guild.ejs +++ b/dashboard/views/stats/guild.ejs @@ -21,7 +21,7 @@
    -

    <%= translate("dashboard:STATS") %> <%= bot.guilds.cache.get(guildID).name %> Dashboard v1.1

    +

    <%= translate("common:STATS") %> <%= bot.guilds.cache.get(guildID).name %> Dashboard v1.1

    diff --git a/dashboard/views/user.ejs b/dashboard/views/user.ejs index eea6025c..e22bbaee 100644 --- a/dashboard/views/user.ejs +++ b/dashboard/views/user.ejs @@ -98,7 +98,7 @@
    - <%= translate("economy/profile:EXP").substr(2) %> + <%= translate("economy/profile:XP").substr(2) %> <%= guild.members.find(u => u.id === userInfos.id).exp %> / <%= 5 * (guild.members.find(u => u.id === userInfos.id).level * guild.members.find(u => u.id === userInfos.id).level) + 80 * guild.members.find(u => u.id === userInfos.id).level + 100 %>
    diff --git a/events/CommandHandler.js b/events/CommandHandler.js index b785210a..65afb157 100644 --- a/events/CommandHandler.js +++ b/events/CommandHandler.js @@ -46,7 +46,7 @@ class CommandHandler extends BaseEvent { userData.achievements.firstCommand.achieved = true; userData.markModified("achievements.firstCommand"); await userData.save(); - await interaction.channel.send({ + await interaction.followUp({ files: [{ name: "achievement_unlocked2.png", attachment: "./assets/img/achievements/achievement_unlocked2.png" diff --git a/events/MessageHandler.js b/events/MessageHandler.js index a1e240f4..42b39b43 100644 --- a/events/MessageHandler.js +++ b/events/MessageHandler.js @@ -21,21 +21,15 @@ class MessageCreate extends BaseEvent { if (message.content.includes("bitches") && !message.content.includes("no bitches")) message.reply({ files: [{ name: "nob.png", attachment: "./assets/img/nob.png" }] }); const data = {}; - data.config = client.config; - if (message.author.bot) return; - if (message.guild && !message.member) await message.guild.members.fetch(message.author.id); - if (message.guild) { const guild = await client.findOrCreateGuild({ id: message.guild.id }); message.guild.data = data.guildData = guild; } - if (message.content.match(new RegExp(`^<@!?${client.user.id}>( |)$`))) return message.replyT("misc:HELLO_SERVER", { username: message.author.username }); - if (message.guild) { const memberData = await client.findOrCreateMember({ id: message.author.id, @@ -56,10 +50,7 @@ class MessageCreate extends BaseEvent { if (/(discord\.(gg|io|me|li)\/.+|discordapp\.com\/invite\/.+)/i.test(message.content)) { if (!message.channel.permissionsFor(message.member).has(PermissionsBitField.Flags.ManageMessages)) { message.delete(); - message.author.send("```" + message.content + "```"); - return message.error("administration/automod:DELETED", { - username: message.author.tag - }); + return message.error("administration/automod:DELETED"); } } } diff --git a/helpers/tictactoe.js b/helpers/tictactoe.js index 1dbd0b9e..105abc5a 100644 --- a/helpers/tictactoe.js +++ b/helpers/tictactoe.js @@ -1,9 +1,9 @@ // Thanks to simply-djs for this =) -const { EmbedBuilder, ButtonBuilder, ActionRowBuilder, ButtonStyle } = require("discord.js"); +const { EmbedBuilder, ButtonBuilder, ActionRowBuilder, ButtonStyle, ComponentType } = require("discord.js"); /** - * @param {require("discord.js").Message} message + * @param {import("discord.js").ChatInputCommandInteraction} interaction * @param {Array} options */ /** @@ -80,12 +80,12 @@ async function tictactoe(interaction, options = {}) { const accept = new ButtonBuilder() .setLabel(interaction.translate("common:ACCEPT")) - .setStyle("SUCCESS") + .setStyle(ButtonStyle.Success) .setCustomId("acceptttt"); const decline = new ButtonBuilder() .setLabel(interaction.translate("common:DECLINE")) - .setStyle("DANGER") + .setStyle(ButtonStyle.Danger) .setCustomId("declinettt"); const accep = new ActionRowBuilder().addComponents([ @@ -94,7 +94,6 @@ async function tictactoe(interaction, options = {}) { ]); let m; - if (interaction.commandId) { m = await interaction.reply({ content: interaction.translate("economy/tictactoe:INVITE_USER", { @@ -113,10 +112,10 @@ async function tictactoe(interaction, options = {}) { }); } const collector = m.createMessageComponentCollector({ - type: "BUTTON", + componentType: ComponentType.Button, time: 30000 }); - collector.on("collect", async (button) => { + collector.on("collect", async button => { if (button.user.id !== opponent.id) return button.reply({ content: interaction.translate("economy/tictactoe:REQUEST_SEND", { @@ -129,8 +128,8 @@ async function tictactoe(interaction, options = {}) { button.deferUpdate(); return collector.stop("decline"); } else if (button.customId == "acceptttt") { + button.deferUpdate(); collector.stop(); - if (interaction.commandId) button.message.delete(); const fighters = [ (interaction.user ? interaction.user : interaction.author).id, @@ -200,11 +199,11 @@ async function tictactoe(interaction, options = {}) { let msg; if (interaction.commandId) { - msg = await interaction.reply({ + msg = await interaction.editReply({ embeds: [ epm.setDescription( interaction.translate("economy/tictactoe:WAITING", { - user: Args.userid, + user: `<@${Args.userid}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }) ) @@ -215,7 +214,7 @@ async function tictactoe(interaction, options = {}) { embeds: [ epm.setDescription( interaction.translate("economy/tictactoe:WAITING", { - user: Args.userid, + user: `<@${Args.userid}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }) ) @@ -342,7 +341,7 @@ async function tictactoe(interaction, options = {}) { return m .edit({ content: interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }), components: buttons, @@ -350,27 +349,27 @@ async function tictactoe(interaction, options = {}) { embeds: [ epm.setDescription( interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }) ) ] }) - .then((m) => { + .then(m => { m.react("⭕"); }); else if (!options.resultBtn || options.resultBtn === false) return m .edit({ content: interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }), embeds: [ epm.setDescription( `${interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" })}\n\`\`\`\n${Args.a1.emoji .replace(o_emoji, "⭕") @@ -398,7 +397,7 @@ async function tictactoe(interaction, options = {}) { ], components: [] }) - .then((m) => { + .then(m => { m.react("⭕"); }); } else if (Args.user == 1) { @@ -424,7 +423,7 @@ async function tictactoe(interaction, options = {}) { ) ] }) - .then((m) => { + .then(m => { m.react("⭕"); }); else if (!options.resultBtn || options.resultBtn === false) @@ -466,7 +465,7 @@ async function tictactoe(interaction, options = {}) { ], components: [] }) - .then((m) => { + .then(m => { m.react("⭕"); }); } @@ -530,33 +529,33 @@ async function tictactoe(interaction, options = {}) { return m .edit({ content: interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }), components: buttons, embeds: [ epm.setDescription( interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }) ) ] }) - .then((m) => { + .then(m => { m.react("❌"); }); else if (!options.resultBtn || options.resultBtn === false) return m .edit({ content: interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" }), embeds: [ epm.setDescription( `${interaction.translate("economy/tictactoe:WON", { - winner: fighters[1], + winner: `<@${fighters[1]}>`, emoji: client.emojis.cache.get(o_emoji) || "⭕" })}\n\`\`\`\n${Args.a1.emoji .replace(o_emoji, "⭕") @@ -584,7 +583,7 @@ async function tictactoe(interaction, options = {}) { ], components: [] }) - .then((m) => { + .then(m => { m.react("❌"); }); } else if (Args.user == 1) { @@ -610,7 +609,7 @@ async function tictactoe(interaction, options = {}) { ) ] }) - .then((m) => { + .then(m => { m.react("❌"); }); else @@ -651,7 +650,7 @@ async function tictactoe(interaction, options = {}) { ], components: [] }) - .then((m) => { + .then(m => { m.react("❌"); }); } @@ -662,7 +661,7 @@ async function tictactoe(interaction, options = {}) { embeds: [ epm.setDescription( interaction.translate("economy/tictactoe:WAITING", { - user: Args.userid, + user: `<@${Args.userid}>`, emoji: Args.user == 0 ? `${client.emojis.cache.get(o_emoji) || "⭕"}` : `${client.emojis.cache.get(x_emoji) || "❌"}` }) ) @@ -671,12 +670,12 @@ async function tictactoe(interaction, options = {}) { }); const collector = m.createMessageComponentCollector({ - componentType: "BUTTON", + componentType: ComponentType.Button, max: 1, time: 30000 }); - collector.on("collect", (b) => { + collector.on("collect", b => { if (b.user.id !== Args.userid) { b.reply({ content: interaction.translate("economy/tictactoe:CANT_PLAY"), @@ -710,7 +709,7 @@ async function tictactoe(interaction, options = {}) { ); const objectFilter = (obj, predicate) => Object.keys(obj) - .filter((key) => predicate(obj[key])) + .filter(key => predicate(obj[key])) .reduce((res, key) => ((res[key] = obj[key]), res), {}); const Brgs = objectFilter( map(Args, (_, fruit) => fruit.emoji == dashmoji), @@ -778,7 +777,7 @@ async function tictactoe(interaction, options = {}) { content: interaction.translate("economy/tictactoe:TIE"), embeds: [epm.setDescription(interaction.translate("economy/tictactoe:TIE_DESC"))] }) - .then((m) => { + .then(m => { m.react(dashmoji); }); else @@ -813,7 +812,7 @@ async function tictactoe(interaction, options = {}) { ], components: [] }) - .then((m) => { + .then(m => { m.react(dashmoji); }) .catch(() => {}); @@ -827,7 +826,7 @@ async function tictactoe(interaction, options = {}) { if (collected.size === 0 && reason == "time") m.edit({ content: interaction.translate("economy/tictactoe:NO_ANSWER", { - user: Args.userid + user: `<@${Args.userid}>` }), components: [] }); diff --git a/index.js b/index.js index bf86938e..58a307f4 100644 --- a/index.js +++ b/index.js @@ -18,6 +18,6 @@ const client = new JaBa({ client.on("disconnect", () => client.logger.log("Bot is disconnecting...", "warn")) .on("reconnecting", () => client.logger.log("Bot reconnecting...", "warn")) - .on("warn", (info) => client.logger.log(info, "warn")); -// .on("error", (e) => client.logger.log(e, "error")) -process.on("unhandledRejection", (err) => console.error(err)); \ No newline at end of file + .on("warn", warn => client.logger.log(warn, "warn")) + .on("error", e => client.logger.log(`${e.message}\n${e.stack}`, "error")); +process.on("unhandledRejection", e => console.error(e)); \ No newline at end of file diff --git a/languages/en-US/common.json b/languages/en-US/common.json index 9da01d25..b7f0d688 100644 --- a/languages/en-US/common.json +++ b/languages/en-US/common.json @@ -46,10 +46,10 @@ "PAGE": "Page", "MESSAGE": "Message", "PROFILE": "Profile", - "CONFIGURATION": "Configuration", + "SETTINGS": "Configuration", "LANGUAGE": "Language", "CHANNEL": "Channel", - "UPDATE": "Update", + "APPLY": "Apply", "SUGGESTIONS": "Suggestions", "MODLOGS": "Moderation logs", "NO_CHANNEL": "No channel", diff --git a/languages/en-US/economy/profile.json b/languages/en-US/economy/profile.json index 3b0be50f..576d316c 100644 --- a/languages/en-US/economy/profile.json +++ b/languages/en-US/economy/profile.json @@ -12,7 +12,7 @@ "REPUTATION": "🎩 Reputation", "REP_POINTS": "**{{points}}** point(s)", "LEVEL": "📊 Level", - "EXP": "🔮 Experience", + "XP": "🔮 Experience", "BIRTHDATE": "🎂 Birthdate", "NO_BIRTHDATE": "No birthdate available", "LOVER": "❤ Lover", diff --git a/languages/ru-RU/administration/automod.json b/languages/ru-RU/administration/automod.json index e5041dc9..6fa6a856 100644 --- a/languages/ru-RU/administration/automod.json +++ b/languages/ru-RU/administration/automod.json @@ -1,10 +1,9 @@ { - "DESCRIPTION": "Включить или отключить автоудаление Discord приглашений", - "USAGE": "automod [on/off] (#канал)", - "EXAMPLES": "automod on\nautomod off #general\nautomod off", - "MISSING_STATUS": "Укажите значение `on` или `off`!", - "ENABLED": "**Discord приглашения будут автоматически удаляться!**\n\n:arrow_right_hook: *Используйте `automod off #channel`, чтобы игнорировать канал!*", + "DESCRIPTION": "Включить или отключить автоудаление ссылок-приглашений", + "USAGE": "automod [true/false] (#канал)", + "EXAMPLES": "automod true\nautomod false #general\nautomod false", + "ENABLED": "Ссылки-приглашения будут удаляться автоматически\nИспользуйте `automod false #channel` для игнорирования канала!", "DISABLED_CHANNEL": "Автомодерация не будет выполняться в {{channel}}!", - "DISABLED": "Автомодерация отключена на данном сервере!", + "DISABLED": "Автомодерация отключена!", "DELETED": "Ваше сообщение было удалено, т.к. содержало в себе ссылку-приглашение!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/autorole.json b/languages/ru-RU/administration/autorole.json index 58b8ab7d..3c672e37 100644 --- a/languages/ru-RU/administration/autorole.json +++ b/languages/ru-RU/administration/autorole.json @@ -1,9 +1,8 @@ { - "DESCRIPTION": "Включить или отключить автоназначение роли при входе на сервер!", + "DESCRIPTION": "Включить или отключить автоназначение роли при входе на сервер", "USAGE": "autorole [true/false] (@роль)", "EXAMPLES": "autorole true @новенький\nautorole false", "MISSING_ROLE": "Укажите роль!", - "SUCCESS_ENABLED": "Автоназначение роли включено!\nНовые пользователи будут автоматически получать **{{roleName}}** при входе на сервер.", - "ALREADY_DISABLED": "**Автоназначение роли уже отключено.**\n\n*Используйте `autorole true @роль`, чтобы включить!*", - "SUCCESS_DISABLED": "**Автоназначение роли отключено!**\n\n*Используйте `config`, чтобы увидеть обновлённые настройки!*" + "SUCCESS_ENABLED": "Автоназначение роли включено!\nНовые пользователи будут автоматически получать **{{role}}** при входе на сервер.", + "SUCCESS_DISABLED": "Автоназначение роли отключено!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/config.json b/languages/ru-RU/administration/config.json index 039b2975..b9b2efe6 100644 --- a/languages/ru-RU/administration/config.json +++ b/languages/ru-RU/administration/config.json @@ -1,10 +1,8 @@ { - "DESCRIPTION": "Показать конфигурацию сервера", + "DESCRIPTION": "Показать настройки сервера", "USAGE": "config", "EXAMPLES": "config", - "PREFIX_TITLE": "Префикс", "AUTOROLE_TITLE": "Автоназначение роли при входе", - "AUTOROLE_DISABLED": "Автоназначение роли отключено.", "WELCOME_TITLE": "Приветствие", "WELCOME_CONTENT": "Канал: {{channel}}\nКарточка: {{withImage}}", "GOODBYE_TITLE": "Прощание", @@ -14,9 +12,9 @@ "MODLOGS": "Логи модерации: {{channel}}", "BIRTHDAYS": "Поздравления с днём рождения: {{channel}}", "SUGGESTIONS": "Предложения: {{channel}}", - "REPORTS": "Жалобы: *{{channel}}*", + "REPORTS": "Жалобы: {{channel}}", "AUTOMOD_TITLE": "Автомодерация", - "AUTOMOD_CONTENT": "Автомодерация включена.\n*Игнорируемые каналы: {{channels}}*", + "AUTOMOD_CONTENT": "Автомодерация включена.\nИгнорируемые каналы: {{channels}}", "AUTODELETEMOD": "Автоудаление команд модерации", "AUTODELETEMOD_ENABLED": "Автоудаление команд модерации включено.", "AUTODELETEMOD_DISABLED": "Автоудаление команд модерации отключено.", diff --git a/languages/ru-RU/administration/deletemod.json b/languages/ru-RU/administration/deletemod.json index 8ac6f0cc..3272a5ef 100644 --- a/languages/ru-RU/administration/deletemod.json +++ b/languages/ru-RU/administration/deletemod.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Включить или отключить автоудаление команд модерации!", + "DESCRIPTION": "Включить или отключить автоудаление команд модерации", "USAGE": "deletemod [true/false]", - "EXAMPLES": "deletemod on", + "EXAMPLES": "deletemod true", "ENABLED": "Автоудаление команд модерации включено!", "DISABLED": "Автоудаление команд модерации отключено!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/goodbye.json b/languages/ru-RU/administration/goodbye.json index e7510621..0f8b1e4b 100644 --- a/languages/ru-RU/administration/goodbye.json +++ b/languages/ru-RU/administration/goodbye.json @@ -1,12 +1,12 @@ { - "DESCRIPTION": "Включить или отключить сообщения при выходе пользователя с сервера!", + "DESCRIPTION": "Включить или отключить сообщения при выходе пользователя с сервера", "USAGE": "goodbye (test)", "EXAMPLES": "goodbye\ngoodbye test", "TEST": "Проверить", - "TEST_SUCCESS": "Тест выполнен!", + "TEST_SUCCESS": "Тест выполнен...", "CONFIG": "Настроить", "IMAGE": "Добавить карточку к сообщению?", - "ENABLED": "**Прощальные сообщения включены в {{channel}}!**\n*Используйте `goodbye test` для предпросмотра вашего сообщения!*", + "ENABLED": "Прощальные сообщения включены в {{channel}}!\nИспользуйте `goodbye test` для просмотра сообщения!", "DISABLED": "Прощальные сообщения отключены!", "DEFAULT_MESSAGE": "Пока, {user}! Нас теперь {membercount} без тебя :'(", "IMG_GOODBYE": "Вышел с {{server}}!", diff --git a/languages/ru-RU/administration/ignore.json b/languages/ru-RU/administration/ignore.json deleted file mode 100644 index 9247c31c..00000000 --- a/languages/ru-RU/administration/ignore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "DESCRIPTION": "Включить или отключить использование команд в канале", - "USAGE": "ignore [канал]", - "EXAMPLES": "ignore #основной", - "ALLOWED": "Теперь команды в {{channel}} разрешены!", - "IGNORED": "Теперь команды в {{channel}} запрещены!" -} \ No newline at end of file diff --git a/languages/ru-RU/administration/setbirthdays.json b/languages/ru-RU/administration/setbirthdays.json index 1ce39d04..6a9952af 100644 --- a/languages/ru-RU/administration/setbirthdays.json +++ b/languages/ru-RU/administration/setbirthdays.json @@ -1,7 +1,7 @@ { "DESCRIPTION": "Установить канал для поздравлений с днём рождения", - "USAGE": "setbirthdays (#канал)", - "EXAMPLES": "setbirthdays #дни-рождения\nsetbirthdays", - "ENABLED": "Поздравления включены в канале **{{channel}}**", - "DISABLED": "Поздравления отключены" + "USAGE": "setbirthdays [true/false] (#канал)", + "EXAMPLES": "setbirthdays true #birthdays\nsetbirthdays false", + "ENABLED": "Поздравления включены в канале **{{channel}}**!", + "DISABLED": "Поздравления отключены!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/setlang.json b/languages/ru-RU/administration/setlang.json index f20471b3..0a81508c 100644 --- a/languages/ru-RU/administration/setlang.json +++ b/languages/ru-RU/administration/setlang.json @@ -1,7 +1,6 @@ { - "DESCRIPTION": "Изменить язык бота на сервере!", + "DESCRIPTION": "Изменить язык бота на сервере", "USAGE": "setlang [язык]", - "EXAMPLES": "setlang ru\nsetlang uk", - "MISSING_LANG": "Выберите язык из списка: {{list}}", + "EXAMPLES": "setlang Русский", "SUCCESS": ":flag_ru: Язык сервера изменён на **{{lang}}**!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/setmodlogs.json b/languages/ru-RU/administration/setmodlogs.json index f7f4bb87..c0ebda81 100644 --- a/languages/ru-RU/administration/setmodlogs.json +++ b/languages/ru-RU/administration/setmodlogs.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Установить канал для логов модерации!", - "USAGE": "setmodlogs (#канал)", - "EXAMPLES": "setmodlogs #логи\nsetmodlogs", + "DESCRIPTION": "Установить канал для логов модерации", + "USAGE": "setmodlogs [true/false] (#канал)", + "EXAMPLES": "setmodlogs true #логи\nsetmodlogs false", "ENABLED": "Логи модерации включены в канале **{{channel}}**!", "DISABLED": "Логи модерации отключены!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/setnews.json b/languages/ru-RU/administration/setnews.json index 099a07e4..97d2313f 100644 --- a/languages/ru-RU/administration/setnews.json +++ b/languages/ru-RU/administration/setnews.json @@ -1,7 +1,7 @@ { "DESCRIPTION": "Установить канал для новостей бота", - "USAGE": "setnews (#канал)", - "EXAMPLES": "setnews #bot-news\nsetnews", + "USAGE": "setnews [true/false] (#канал)", + "EXAMPLES": "setnews true #bot-news\nsetnews false", "ENABLED": "Новости бота включены в канале **{{channel}}**!", "DISABLED": "Новости бота отключены!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/setreports.json b/languages/ru-RU/administration/setreports.json index f014fb44..1a43f255 100644 --- a/languages/ru-RU/administration/setreports.json +++ b/languages/ru-RU/administration/setreports.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Установить канал для жалоб!", - "USAGE": "setreports (#канал)", - "EXAMPLES": "setreports #жалобы\nsetreports", + "DESCRIPTION": "Установить канал для жалоб", + "USAGE": "setreports [true/false] (#канал)", + "EXAMPLES": "setreports true #жалобы\nsetreports false", "ENABLED": "Жалобы будут отправляться в **{{channel}}**!", "DISABLED": "Жалобы отключены!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/setsuggests.json b/languages/ru-RU/administration/setsuggests.json index b7190f3c..eeaeda28 100644 --- a/languages/ru-RU/administration/setsuggests.json +++ b/languages/ru-RU/administration/setsuggests.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Установить канал для предложений!", - "USAGE": "setsuggests (#канал)", - "EXAMPLES": "setsuggests #предложения\nsetsuggests", + "DESCRIPTION": "Установить канал для предложений", + "USAGE": "setsuggests [true/false] (#канал)", + "EXAMPLES": "setsuggests true #предложения\nsetsuggests false", "ENABLED": "Предложения будут отправляться в **{{channel}}**!", "DISABLED": "Предложения отключены!" } \ No newline at end of file diff --git a/languages/ru-RU/administration/stealemoji.json b/languages/ru-RU/administration/stealemoji.json index 099264db..02ffeb9e 100644 --- a/languages/ru-RU/administration/stealemoji.json +++ b/languages/ru-RU/administration/stealemoji.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Украсть эмодзи на данный сервер с другого!", + "DESCRIPTION": "Скопировать эмодзи на текущий сервер", "USAGE": "stealemoji [эмодзи]", "EXAMPLES": "stealemoji :coolstorybob:", "SUCCESS": "{{emoji}} добавлен!", - "ERROR": "{{emoji}} не был добавлен. Проверьте, есть ли место для добавления эмодзи!" + "ERROR": "Произошла ошибка при добавлении {{emoji}}.\n{{e}}" } \ No newline at end of file diff --git a/languages/ru-RU/administration/welcome.json b/languages/ru-RU/administration/welcome.json index 1d52b619..5de2388f 100644 --- a/languages/ru-RU/administration/welcome.json +++ b/languages/ru-RU/administration/welcome.json @@ -1,8 +1,8 @@ { - "DESCRIPTION": "Включить или отключить сообщения при входе пользователя на сервер!", + "DESCRIPTION": "Включить или отключить сообщения при входе пользователя на сервер", "USAGE": "welcome (test)", "EXAMPLES": "welcome\nwelcome test", - "ENABLED": "**Приветствующие сообщения включены в {{channel}}!**\n*Используйте `welcome test` для предпросмотра вашего сообщения!*", + "ENABLED": "Приветствующие сообщения включены в {{channel}}!\nИспользуйте `welcome test` для просмотра сообщения!", "DISABLED": "Приветствующие сообщения отключены!", "DEFAULT_MESSAGE": "Добро пожаловать {user}! Нас теперь {membercount}!", "IMG_WELCOME": "Добро пожаловать на {{server}}!", diff --git a/languages/ru-RU/common.json b/languages/ru-RU/common.json index 6010aa6a..cdce2fa3 100644 --- a/languages/ru-RU/common.json +++ b/languages/ru-RU/common.json @@ -1,6 +1,7 @@ { "YES": "Да", "NO": "Нет", + "APPLY": "Применить", "ACCEPT": "Принять", "CANCEL": "Отменить", "DECLINE": "Отказаться", @@ -33,14 +34,9 @@ "STATUS_DND": "Не беспокоить", "ROLE": "Роль", "ROLES": "Роли", - "JOIN": "Присоеденился", + "JOINED": "Присоеденился", "COLOR": "Цвет", "NICKNAME": "Ник на сервере", - "DESCRIPTION": "Описание", - "WEBSITE": "Сайт", - "INVITE": "Пригласить", - "SUPPORT": "Поддержка", - "LINKS": "Ссылки", "CREDITS": "Кредиты", "LEVEL": "Уровень", "REP": "Очки репутации", @@ -49,19 +45,16 @@ "DEFEAT": "Поражение", "MODERATOR": "Модератор", "DURATION": "Длительность", - "EXPIRY": "Окончание", - "TITLE": "Заголовок", "SERVERS": "Сервера", "PAGE": "Страница", "MESSAGE": "Сообщение", "PROFILE": "Профиль", - "CONFIGURATION": "Настройки", + "SETTINGS": "Настройки", "EMOJI": "Эмодзи", "IP": "IP адрес", "INT": "Целое число", "LANGUAGE": "Язык", "CHANNEL": "Канал", - "UPDATE": "Обновить", "UNKNOWN": "Неизвестно", "NOTHING_SELECTED": "Ничего не выбрано", "AVAILABLE_OPTIONS": "Доступные параметры:" diff --git a/languages/ru-RU/dashboard.json b/languages/ru-RU/dashboard.json index 8c01314b..917b03e7 100644 --- a/languages/ru-RU/dashboard.json +++ b/languages/ru-RU/dashboard.json @@ -16,10 +16,6 @@ "GOODBYE_IMG": "😢 Добавлять карточку", "CHANNELS_CONF": "🌀 Специальные каналы", "AUTOROLE_CONF": "🎖️ Автоматическое назначение роли", - "ENABLE_MESSAGES": "Включить", - "DISABLE_MESSAGES": "Отключить", - "ENABLE_AUTOROLE": "Включить", - "DISABLE_AUTOROLE": "Выключить", "NO_CHANNEL": "Канал не выбран", "NEWS": "Новости бота", "REPORTS": "Жалобы", @@ -27,7 +23,6 @@ "SUGGESTIONS": "Предложения", "BIRTHDAYS": "Поздравления с днём рождения", "SELECTOR": "Выбор серверов", - "STATS": "Статистика", "MANAGE": "Управление", "COOLDOWNS": "Откаты", "REP": "Команда rep", diff --git a/languages/ru-RU/economy/achievements.json b/languages/ru-RU/economy/achievements.json index 2e6923e3..75f458b1 100644 --- a/languages/ru-RU/economy/achievements.json +++ b/languages/ru-RU/economy/achievements.json @@ -1,10 +1,10 @@ { - "DESCRIPTION": "Показать список ваших достижений!", - "USAGE": "achievements", - "EXAMPLES": "achievements", + "DESCRIPTION": "Показать список достижений пользователя", + "USAGE": "achievements (@пользователь)", + "EXAMPLES": "achievements\nachievements @Jonny_Bro#4226", "SEND_CMD": "Используйте свою первую команду!", "CLAIM_SALARY": "Получите зарплату 10 раз!", - "MARRY": "Найдите свою половинку и женитесь!", + "MARRY": "Найдите вторую половинку и женитесь!", "SLOTS": "Выиграйте 3 раза подряд в слоты!", "TIP": "Поддержите разработчика!", "REP": "Достигните 20 очков репутации!", diff --git a/languages/ru-RU/economy/bank.json b/languages/ru-RU/economy/bank.json new file mode 100644 index 00000000..9d89fccb --- /dev/null +++ b/languages/ru-RU/economy/bank.json @@ -0,0 +1,12 @@ +{ + "DESCRIPTION": "Управление банковским счётом", + "USAGE": "bank [deposit/withdraw] [сумма/all]", + "EXAMPLES": "bank deposit 1000\nbank withdraw all", + "OPTION": "Действие", + "DEPOSIT": "Внести", + "WITHDRAW": "Снять", + "NOT_ENOUGH_CREDIT": "У вас нет {{money}}!", + "NOT_ENOUGH_BANK": "Недостаточно кредитов на банковском счету, необходимо {{money}}!", + "SUCCESS_DEP": "{{money}} внесено на ваш банковский счёт!", + "SUCCESS_WD": "Вы сняли {{money}} с вашего банковского счёта" +} \ No newline at end of file diff --git a/languages/ru-RU/economy/birthdate.json b/languages/ru-RU/economy/birthdate.json index 35703a83..36c19ae6 100644 --- a/languages/ru-RU/economy/birthdate.json +++ b/languages/ru-RU/economy/birthdate.json @@ -1,9 +1,9 @@ { "DESCRIPTION": "Установить дату рождения", "USAGE": "birthdate [ДД/ММ/ГГГГ]", - "EXAMPLES": "birthdate 01/01/2010", - "MISSING_DATE": "Укажите дату в формате 20/11/2003", - "INVALID_DATE": "Используйте данный формат: ДД/ММ/ГГГГ. Например, `1 января 2010` будет `01/01/2010`.", + "EXAMPLES": "birthdate 17/03/2002", + "DATE": "Дата в формате ДД/ММ/ГГГГ (Например: 17/03/2002)", + "INVALID_DATE": "Используйте данный формат: ДД/ММ/ГГГГ. Например: `17 марта 2002` будет `17/03/2002`.", "DATE_TOO_LOW": "Вам больше 80 лет? :eyes:", "DATE_TOO_HIGH": "Хммм... Вы ещё не родились!", "HAPPY_BIRTHDAY": "День рождения", diff --git a/languages/ru-RU/economy/deposit.json b/languages/ru-RU/economy/deposit.json deleted file mode 100644 index 63fc4074..00000000 --- a/languages/ru-RU/economy/deposit.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "DESCRIPTION": "Внести кредиты в банк", - "USAGE": "deposit [сумма/all]", - "EXAMPLES": "deposit 1000\ndeposit all", - "MISSING_AMOUNT": "Укажите сумму!", - "NO_CREDIT": "У вас нет кредитов!", - "NOT_ENOUGH_CREDIT": "У вас нет `{{money}}`!", - "SUCCESS": "{{money}} внесено на ваш банковский счёт!" -} \ No newline at end of file diff --git a/languages/ru-RU/economy/divorce.json b/languages/ru-RU/economy/divorce.json index a226f7c8..26d856d0 100644 --- a/languages/ru-RU/economy/divorce.json +++ b/languages/ru-RU/economy/divorce.json @@ -1,8 +1,8 @@ { - "DESCRIPTION": "Развестись с пользователем!", + "DESCRIPTION": "Развестись с пользователем", "USAGE": "divorce", "EXAMPLES": "divorce", "NOT_MARRIED": "Вы не состоите в браке!", - "DIVORCED": "Вы развелись с **{{username}}**!", - "DIVORCED_U": "**{{username}}** развёлся с вами!" + "DIVORCED": "Вы развелись с {{user}}!", + "DIVORCED_U": "{{user}} развёлся с вами!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/horserace.json b/languages/ru-RU/economy/horserace.json deleted file mode 100644 index 6c40f9d2..00000000 --- a/languages/ru-RU/economy/horserace.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "DESCRIPTION": "Конные скачки!", - "USAGE": "horserace [create/bet/go]", - "EXAMPLES": "horserace create\nhorserace bet 3 100", - "MISSING_STATUS": "Выберите параметр: `create`, `bet` или `go`!", - "HORSE_NUM": "На скачках всего 5 лошадей!", - "EMBED_T": "Конные скачки", - "HORSE_NAME": "Лошадь {{number}}", - "HORSE_VALUE": "Скорость - {{speed}}\nПрибыль - *ставка* x **{{profit}}**", - "BET": "{{user}} поставил {{amount}} на лошадь **{{horse}}**!", - "NO_WINNERS": "Победила лошадь **{{horse}}**. Никто не выиграл кредиты!", - "WINNERS": "Победила лошадь **{{horse}}**. {{winners}}!", - "GAME_RUNNING": "Игра уже идёт!", - "NO_GAME_RUNNING": "Игра не начата!" -} \ No newline at end of file diff --git a/languages/ru-RU/economy/importmee6.json b/languages/ru-RU/economy/importmee6.json new file mode 100644 index 00000000..5e756746 --- /dev/null +++ b/languages/ru-RU/economy/importmee6.json @@ -0,0 +1,5 @@ +{ + "DESCRIPTION": "Импортировать свой уровень из MEE6", + "USAGE": "importmee6", + "EXAMPLES": "importmee6" +} \ No newline at end of file diff --git a/languages/ru-RU/economy/leaderboard.json b/languages/ru-RU/economy/leaderboard.json index 8fb626a7..8696e917 100644 --- a/languages/ru-RU/economy/leaderboard.json +++ b/languages/ru-RU/economy/leaderboard.json @@ -1,10 +1,11 @@ { - "DESCRIPTION": "Показать таблице лидеров по кредитам, уровню или очкам репутации!", + "DESCRIPTION": "Показать таблицу лидеров по кредитам, уровню или очкам репутации", "USAGE": "leaderboard [rep/level/credits]", - "EXAMPLES": "leaderboard credits\nleaderboard level", - "MISSING_TYPE": "Выберите таблицу: `credits`, `level` или `rep`!", + "EXAMPLES": "leaderboard credits", + "LEVEL": "Уровень", + "MONEY": "Кредиты", + "REP": "Репутация", "MOBILE": ":confused: Я заметил, что вы онлайн с телефона... Таблица лидеров может отображаться некорректно на маленьких экранах. Попробуйте позже с другого устройства!", "TABLE": "Таблица лидеров {{name}}", - "TOP": "Топ 20", - "XP": "Опыт" + "TOP": "Топ 20" } \ No newline at end of file diff --git a/languages/ru-RU/economy/marry.json b/languages/ru-RU/economy/marry.json index 30397dbf..9ee67e91 100644 --- a/languages/ru-RU/economy/marry.json +++ b/languages/ru-RU/economy/marry.json @@ -1,18 +1,17 @@ { - "DESCRIPTION": "Женитесь на том, кого любите!", + "DESCRIPTION": "Женитесь на том, кого любите", "USAGE": "marry [@пользователь]", "EXAMPLES": "marry @Jonny_Bro#4226", - "INVALID_MEMBER": "Вы должны упомянуть пользователя!", "ALREADY_MARRIED": "Вы уже состоите в браке! Вы можете развестить с помощью команды `divorce`.", - "ALREADY_MARRIED_USER": "Место занято! **{{username}}** уже состоит в браке!", + "ALREADY_MARRIED_USER": "Вы опоздали! {{user}} уже состоит в браке!", "YOURSELF": "Вы не можете жениться на себе!", - "REQUEST_AUTHOR_TO_AMEMBER": "Вы уже отправили предложение **{{username}}**!", - "REQUEST_AMEMBER_TO_AUTHOR": "**{{username}}** отправил(а) вам предложение! Вы можете отказать или согласиться (либо дождаться истечения срока предложения).", - "REQUEST_AMEMBER_TO_MEMBER": "**{{secondUsername}}** уже отправил(а) предложение **{{firstUsername}}**!", - "REQUEST_MEMBER_TO_AMEMBER": "**{{firstUsername}} уже отправил(а) предложение **{{secondUsername}}**! Подождите пока **{{secondUsername}}** согласиться или откажет на предложение **{{firstUsername}}** (либо дождитесь истечения срока предложения)!", - "TIMEOUT": "{{username}} не ответил(а)... Подождите пока он/она будут в сети и попробуйте снова!", - "SUCCESS": "🎉 Поздравляем! **{{creator}}** и **{{partner}}** теперь состоят в браке!", + "REQUEST_AUTHOR_TO_AMEMBER": "Вы уже отправили предложение {{user}}!", + "REQUEST_AMEMBER_TO_AUTHOR": "{{user}} отправил(а) вам предложение! Вы можете отказать или согласиться (либо дождаться истечения срока предложения).", + "REQUEST_AMEMBER_TO_MEMBER": "{{secondUser}} уже отправил(а) предложение {{firstUser}}!", + "REQUEST_MEMBER_TO_AMEMBER": "{{firstUser}} уже отправил(а) предложение {{secondUser}}! Подождите пока {{secondUser}} согласиться или откажет на предложение {{firstUser}} (либо дождитесь истечения срока предложения)!", + "REQUEST": "{{to}}, вы согласны вступить в брак с {{from}}?", + "TIMEOUT": "Время на ответ вышло, попробуйте ещё раз!", "DENIED": "{{creator}}, у меня есть плохие новости... {{partner}} отказался(лась) от вашего предложение.", - "REQUEST": "{{to}}, вы согласны вступить в брак с {{from}}? Ответьте `да` или `нет`!", - "BOT_USER": "Боты вечно одиноки!" + "SUCCESS": "🎉 Поздравляем! **{{creator}}** и **{{partner}}** теперь состоят в браке!", + "BOT_USER": "Боты вечно одиноки ;(" } \ No newline at end of file diff --git a/languages/ru-RU/economy/money.json b/languages/ru-RU/economy/money.json index 65fa69ed..c495df94 100644 --- a/languages/ru-RU/economy/money.json +++ b/languages/ru-RU/economy/money.json @@ -2,5 +2,6 @@ "DESCRIPTION": "Показать количество кредитов у пользователя", "USAGE": "money (@пользователь)", "EXAMPLES": "money\nmoney @Jonny_Bro#4226", + "BOT_USER": "Никто не знает сколько у ботов денег...", "TITLE": "Кредиты {{username}}" } \ No newline at end of file diff --git a/languages/ru-RU/economy/number.json b/languages/ru-RU/economy/number.json index e45de731..ec477e3b 100644 --- a/languages/ru-RU/economy/number.json +++ b/languages/ru-RU/economy/number.json @@ -1,12 +1,12 @@ { - "DESCRIPTION": "Угадай загаданное мною число!", - "USAGE": "number (STOP)", + "DESCRIPTION": "Угадай загаданное мною число", + "USAGE": "number", "EXAMPLES": "number", "GAME_START": "Я загадал число, начинайте!\nНапишите STOP, если хотите остановить игру!", - "BIG": "{{user}} | Моё число **больше** чем `{{number}}`!", - "SMALL": "{{user}} | Моё число **меньше** чем `{{number}}`!", + "TOO_BIG": "{{user}}, моё число **больше** чем `{{number}}`!", + "TOO_SMALL": "{{user}}, моё число **меньше** чем `{{number}}`!", "WON": "{{winner}} выиграл {{credits}}!", "DEFEAT": "Никто не угадал число! Им было **{{number}}**!", - "GAME_STATS": "🎉 | {{winner}} угадал число! Им было __**{{number}}**__!\n\n**Статистика:**\n*-* __**Длительность**__: {{time}}\n*-* __**Участники**__: {{participants}} ({{participantCount}})", + "GAME_STATS": "🎉 | {{winner}} угадал число! Им было **{{number}}**!\n\n**Статистика:**\n*-* __**Длительность**__: {{time}}\n*-* __**Участники ({{participantCount}})**__: {{participants}}", "GAME_RUNNING": "Игра уже идёт!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/pay.json b/languages/ru-RU/economy/pay.json index 99573a24..82d57055 100644 --- a/languages/ru-RU/economy/pay.json +++ b/languages/ru-RU/economy/pay.json @@ -1,11 +1,10 @@ { - "DESCRIPTION": "Отправить кредиты пользователю!", + "DESCRIPTION": "Отправить кредиты пользователю", "USAGE": "pay [@пользователь] [сумма]", "EXAMPLES": "pay @Jonny_Bro#4226 1000", - "INVALID_MEMBER": "Вы должны упомянуть пользователя!", - "BOT_USER": "Ботам не нужны кредиты!", - "YOURSELF": "Вы не можете заплатить самому себе!", + "BOT_USER": "Ботам не нужны деньги B)!", + "YOURSELF": "Вы не можете перевести кредиты самому себе!", "INVALID_AMOUNT": "Укажите сумму", "ENOUGH_MONEY": "У вас нет {{amount}}", - "SUCCESS": "Вы отправили {{amount}} пользователю **{{username}}**!" + "SUCCESS": "Вы отправили {{user}} {{amount}}!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/profile.json b/languages/ru-RU/economy/profile.json index 7498e7ac..fd3d5bb5 100644 --- a/languages/ru-RU/economy/profile.json +++ b/languages/ru-RU/economy/profile.json @@ -3,22 +3,19 @@ "USAGE": "profile (@пользователь)", "EXAMPLES": "profile\nprofile @Jonny_Bro#4226", "BOT_USER": "У ботов нет профиля!", - "TITLE": "Профиль {{username}}", + "TITLE": "Профиль {{user}}", "LINK": "Профиль", - "LINK_TEXT": "Нажмите сюда, чтобы открыть профиль на текущем сервере!", + "LINK_TEXT": "Нажмите сюда, чтобы открыть профиль текущего сервера в панели управления!", "BIO": "🔖 Биография", - "NO_BIO": "Биография отсутствует", "CASH": "💵 Кредиты", "BANK": "💳 Банк", - "GLOBAL": "🌍 Всего кредитов на всех серверах", + "GLOBAL": "🌍 Кредитов на всех серверах", "REPUTATION": "🎩 Репутация", "LEVEL": "📊 Уровень", - "EXP": "🔮 Опыт", + "XP": "🔮 Опыт", "BIRTHDATE": "🎂 Дата рождения", - "NO_BIRTHDATE": "Дата рождения не указана", "LOVER": "❤ Вторая половинка", "REGISTERED": "📅 Профиль создан", - "NO_LOVER": "Свободен", "ACHIEVEMENTS": "🔥 Достижения", "ACHIEVEMENTS_CONTENT": "Получите больше информации с помощью `achievements`!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/rep.json b/languages/ru-RU/economy/rep.json index 451a5455..84651206 100644 --- a/languages/ru-RU/economy/rep.json +++ b/languages/ru-RU/economy/rep.json @@ -1,10 +1,9 @@ { - "DESCRIPTION": "Дать очко репутации пользователю!", + "DESCRIPTION": "Дать репутацию пользователю", "USAGE": "rep [@пользователь]", "EXAMPLES": "rep @Jonny_Bro#4226", "COOLDOWN": "Вы должны подождать **{{time}}** до следующего использования!", - "INVALID_USER": "Вы должны упомянуть пользователя!", - "BOT_USER": "Боты и так крутые!", + "BOT_USER": "Боты и так крутые B)", "YOURSELF": "Вы не можете дать очко репутации самому себе!", - "SUCCESS": "Вы дали очко репутации {{username}}!" + "SUCCESS": "Вы дали очко репутации {{user}}!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/rob.json b/languages/ru-RU/economy/rob.json index 552301c1..f25d1a62 100644 --- a/languages/ru-RU/economy/rob.json +++ b/languages/ru-RU/economy/rob.json @@ -1,16 +1,14 @@ { - "DESCRIPTION": "Попытаться ограбить пользователя!", + "DESCRIPTION": "Попытаться ограбить пользователя", "USAGE": "rob [@пользователь] [сумма]", "EXAMPLES": "rob @Jonny_Bro#4226 100", "BOT_USER": "Вы не можете ограбить бота!", "YOURSELF": "Вы не можете ограбить себя!", - "MISSING_MEMBER": "Вы должны упомянуть пользователя!", - "MISSING_AMOUNT": "Укажите сумму!", - "NOT_ENOUGH_AUTHOR": "У вас должно быть хотя бы **{{moneyMin}}**, чтобы грабить данного пользователя (сейчас у вас **{{moneyCurrent}}**)!", - "NOT_ENOUGH_MEMBER": "Вы не можете ограбить {{user}}, потому что у него нет с собой столько кредитов!", + "NOT_ENOUGH_AUTHOR": "У вас должно быть хотя бы {{moneyMin}}, чтобы грабить данного пользователя (сейчас у вас {{moneyCurrent}})!", + "NOT_ENOUGH_MEMBER": "Вы не можете ограбить {{user}}, потому что у него нет столько кредитов!", "COOLDOWN": "🕵️ {{user}} под защитой.... Попробуйте позже!", - "ROB_WON_1": "🎉 | Поздравляем! Полиция не смогла остановить вас, поэтому вы успешно украли **{{money}}** у {{user}}!", - "ROB_WON_2": "🎉 | Вы ограбили {{user}} на **{{money}}**", - "ROB_LOSE_1": "🚔 | Полиция поймала вас. Теперь вы должны заплатить **{{fine}}**. **{{offset}}** будет выплачено {{user}}.", - "ROB_LOSE_2": "🚓 | Плохие новости... {{user}} вовремя позвонил в полицию. Вы должны заплатить **{{fine}}** и **{{offset}}** будет выплачено {{user}}." + "ROB_WON_1": "🎉 | Поздравляем! Полиция не смогла остановить вас, поэтому вы успешно украли {{money}} у {{user}}!", + "ROB_WON_2": "🎉 | Вы ограбили {{user}} на {{money}}", + "ROB_LOSE_1": "🚔 | Полиция поймала вас. Теперь вы должны заплатить штраф {{fine}}. {{offset}} будет выплачено {{user}}.", + "ROB_LOSE_2": "🚓 | Плохие новости... {{user}} вовремя позвонил в полицию. Вы должны заплатить штраф {{fine}} и {{offset}} будет выплачено {{user}}." } \ No newline at end of file diff --git a/languages/ru-RU/economy/setbio.json b/languages/ru-RU/economy/setbio.json index 0d5d688d..6ff09aa9 100644 --- a/languages/ru-RU/economy/setbio.json +++ b/languages/ru-RU/economy/setbio.json @@ -1,8 +1,7 @@ { - "DESCRIPTION": "Установить биографию!", + "DESCRIPTION": "Установить биографию", "USAGE": "setbio [текст]", - "EXAMPLES": "setbio Меня зовут Жоня, мне 18 и я создатель JaBa :)", - "MISSING": "Укажите биографию!", - "MAX_CHARACT": "Ваша биография не должна превышать 100 символов!", + "EXAMPLES": "setbio Меня зовут Жоня :shock:", + "MAX_CHARACTERS": "Ваша биография не должна превышать 150 символов!", "SUCCESS": "Ваша биография изменена!" } \ No newline at end of file diff --git a/languages/ru-RU/economy/slots.json b/languages/ru-RU/economy/slots.json index f8665868..3c82dc1f 100644 --- a/languages/ru-RU/economy/slots.json +++ b/languages/ru-RU/economy/slots.json @@ -1,8 +1,8 @@ { - "DESCRIPTION": "Казино \"JaBa Casino\"", - "USAGE": "slots (сумма)", - "EXAMPLES": "slots\nslots 100", - "DEFEAT": "**{{username}}** поставил {{money}} и всё проиграл.", - "VICTORY": "**{{username}}** поставил {{money}} и выиграл {{won}}!", + "DESCRIPTION": "Казино \"Casino JaBa\"", + "USAGE": "slots [сумма]", + "EXAMPLES": "slots 100", + "DEFEAT": "{{user}} поставил {{money}} и всё проиграл.", + "VICTORY": "{{user}} поставил {{money}} и выиграл {{won}}!", "NOT_ENOUGH": "У вас нет {{money}}." } \ No newline at end of file diff --git a/languages/ru-RU/economy/tictactoe.json b/languages/ru-RU/economy/tictactoe.json index b8255534..8bf13b50 100644 --- a/languages/ru-RU/economy/tictactoe.json +++ b/languages/ru-RU/economy/tictactoe.json @@ -1,22 +1,21 @@ { - "DESCRIPTION": "Крестики-нолики!", + "DESCRIPTION": "Крестики-нолики", "USAGE": "tictactoe [@пользователь]", "EXAMPLES": "tictactoe @Jonny_Bro#4226", - "NO_USER": "Укажите пользователя!", "BOT_USER": "Вы не можете играть против бота!", "YOURSELF": "Вы не можете играть с самим собой!", "INVITE_USER": "<@{{opponent}}>, вам предложили сыграть в крестики-нолики!", - "REQUEST_SEND": "Запрос отправлен <@{{opponent}}>", + "REQUEST_SEND": "Запрос отправлен {{opponent}}", "REQUEST_WAIT": "Ожидаю ответа {{user}}", - "WAITING": "Ожидаю ход | <@{{user}}>, Ваш эмодзи: {{emoji}}", - "WON": "<@{{winner}}> ({{emoji}}) выиграл!", + "WAITING": "Ожидаю ход | {{user}}, Ваш эмодзи: {{emoji}}", + "WON": "{{winner}} ({{emoji}}) выиграл!", "CANT_PLAY": "Сейчас не ваш ход!", "TIE": "Ничья", "TIE_DESC": "Никто не выиграл!", - "NO_ANSWER": "<@{{user}}> не ответил вовремя!", + "NO_ANSWER": "{{user}} не ответил вовремя!", "NO_ANSWER_TITLE": "Запрос не принят вовремя", - "NOT_ANSWERED": "<@{{user}}> не принял запрос!", + "NOT_ANSWERED": "{{user}} не принял запрос!", "CANCELED": "Игра отменена!", - "CANCELED_DESC": "<@{{user}}> отказался от игры!", + "CANCELED_DESC": "{{user}} отказался от игры!", "TIMES_UP": "Время вышло! Лимит: 30 секунд" } \ No newline at end of file diff --git a/languages/ru-RU/economy/transactions.json b/languages/ru-RU/economy/transactions.json index bc3748af..cddb26d5 100644 --- a/languages/ru-RU/economy/transactions.json +++ b/languages/ru-RU/economy/transactions.json @@ -1,12 +1,11 @@ { - "DESCRIPTION": "Посмотреть историю транзакций!", + "DESCRIPTION": "Посмотреть историю транзакций", "USAGE": "transactions", "EXAMPLES": "transactions", "NO_TRANSACTIONS": "У вас нет транзакций.", "EMBED_TRANSACTIONS": "Ваши транзакции", "BANK": "Банк", "NUMBERS": "Угадай число", - "HORSERACE": "Конные скачки", "TTT": "Крестики-нолики", "T_GOT": "Пополнение", "T_SEND": "Списание", diff --git a/languages/ru-RU/economy/withdraw.json b/languages/ru-RU/economy/withdraw.json deleted file mode 100644 index 71e97ccf..00000000 --- a/languages/ru-RU/economy/withdraw.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "DESCRIPTION": "Снять кредиты из банка!", - "USAGE": "withdraw [сумма/all]", - "EXAMPLES": "withdraw 100\nwithdraw all", - "MISSING_AMOUNT": "Укажите сумму!", - "NO_CREDIT": "Недостаточно кредитов на банковском счёте!", - "NOT_ENOUGH": "У вас должно быть хотя бы `{{money}}`!", - "SUCCESS": "Вы сняли {{money}}!" -} \ No newline at end of file diff --git a/languages/ru-RU/economy/work.json b/languages/ru-RU/economy/work.json index 964fd7f8..b5d1e007 100644 --- a/languages/ru-RU/economy/work.json +++ b/languages/ru-RU/economy/work.json @@ -1,9 +1,9 @@ { - "DESCRIPTION": "Получить зарплату!", + "DESCRIPTION": "Получить зарплату", "USAGE": "work", "EXAMPLES": "work", - "COOLDOWN": "Вы должны подождать **{{time}}** до следующей зарплатой!", - "AWARD": "Закончите слово AWARD чтобы получить 200 дополнительных кредитов!", + "COOLDOWN": "Вы должны подождать **{{time}}** до следующей зарплаты!", + "AWARD": "Закончите серию чтобы получить 200 дополнительных кредитов!", "SALARY": "Зарплата", "SALARY_CONTENT": "Вы получили {{won}}!", "STREAK": "Серия", diff --git a/languages/ru-RU/fun/8ball.json b/languages/ru-RU/fun/8ball.json index a743f73d..2d7e30d6 100644 --- a/languages/ru-RU/fun/8ball.json +++ b/languages/ru-RU/fun/8ball.json @@ -1,5 +1,6 @@ { "DESCRIPTION": "Я говорю правду", + "USAGE": "8ball [вопрос]", "QUESTION": "Вопрос", "EXAMPLES": "8ball JaBa крутой?", "ERR_QUESTION": "Вопрос должен оканчиваться на `?`.", diff --git a/languages/ru-RU/fun/ascii.json b/languages/ru-RU/fun/ascii.json deleted file mode 100644 index 1add4ee3..00000000 --- a/languages/ru-RU/fun/ascii.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "DESCRIPTION": "Превратить текст в ASCII код! Поддерживаются только английские буквы и цифры!", - "USAGE": "ascii [текст]", - "EXAMPLES": "ascii Hello world!", - "TEXT_MISSING": "Введите текст (не больше 20 символов)!" -} \ No newline at end of file diff --git a/languages/ru-RU/fun/lmgtfy.json b/languages/ru-RU/fun/lmgtfy.json index 2a337bab..08ab4cb0 100644 --- a/languages/ru-RU/fun/lmgtfy.json +++ b/languages/ru-RU/fun/lmgtfy.json @@ -1,6 +1,5 @@ { "DESCRIPTION": "Создать LMGTFY (давай я загуглю это для тебя) ссылку", "USAGE": "lmgtfy [запрос]", - "EXAMPLES": "lmgtfy Как создать Discord бота?", - "MISSING": "Укажите запрос!" + "EXAMPLES": "lmgtfy Как создать Discord бота?" } \ No newline at end of file diff --git a/languages/ru-RU/fun/lovecalc.json b/languages/ru-RU/fun/lovecalc.json index a68808bd..d3d811bd 100644 --- a/languages/ru-RU/fun/lovecalc.json +++ b/languages/ru-RU/fun/lovecalc.json @@ -2,5 +2,5 @@ "DESCRIPTION": "Калькулятор любви", "USAGE": "lovecalc [@пользователь1] (@пользователь2)", "EXAMPLES": "lovecalc @Jonny_Bro#4226\nlovecalc @Jonny_Bro#4226 @JaBa#9042", - "CONTENT": "**{{firstMember}}** любит **{{secondMember}}** на **{{percent}}%**!" + "CONTENT": "{{firstMember}} любит {{secondMember}} на **{{percent}}%**!" } \ No newline at end of file diff --git a/languages/ru-RU/fun/memes.json b/languages/ru-RU/fun/memes.json index 167d8112..2e5179ef 100644 --- a/languages/ru-RU/fun/memes.json +++ b/languages/ru-RU/fun/memes.json @@ -1,11 +1,7 @@ { "DESCRIPTION": "Получить мем с выбранного сабреддита", - "USAGE": "memes (тег)", - "EXAMPLES": "memes\nmemes me_irl", - "SEARCHING": "Ищу мем по тегу `{{tag}}`...", - "SEARCHING_RANDOM": "Ищу случайный мем...", - "EMBED_TITLE": "Доступные категории", - "NOT_FOUND": "Данной категории не существует!", + "USAGE": "memes", + "EXAMPLES": "memes", "SUBREDDIT": "Сабреддит", "UPS": "Апвоуты" } \ No newline at end of file diff --git a/languages/ru-RU/general/activity.json b/languages/ru-RU/general/activity.json index 913cb57e..c3398976 100644 --- a/languages/ru-RU/general/activity.json +++ b/languages/ru-RU/general/activity.json @@ -1,7 +1,8 @@ { "DESCRIPTION": "Создать активность в голосовом канале", - "USAGE": "activity (активность)", - "EXAMPLES": "activity\nactivity chess", + "USAGE": "activity", + "EXAMPLES": "activity", "AVAILABLE_ACTIVITIES": "Доступные активности:", + "CLICK_HERE": "Нажмите сюда, чтобы начать {{activity}} в {{channel}}", "BOOST_NEEDED": "Необходим первый уровень буста или выше!" } \ No newline at end of file diff --git a/languages/ru-RU/general/afk.json b/languages/ru-RU/general/afk.json index 42da022a..c3ae19dd 100644 --- a/languages/ru-RU/general/afk.json +++ b/languages/ru-RU/general/afk.json @@ -4,5 +4,5 @@ "EXAMPLES": "afk Сру =)", "SUCCESS": "Теперь вы AFK по причине: **{{reason}}**", "DELETED": "**{{username}}**, ваш AFK статус удалён!", - "IS_AFK": "**{{user}}** сейчас AFK, причина:\n**`{{reason}}`**" + "IS_AFK": "**{{user}}** сейчас AFK, причина:\n```{{reason}}```" } \ No newline at end of file diff --git a/languages/ru-RU/general/avatar.json b/languages/ru-RU/general/avatar.json index db6a6c0d..01aafde5 100644 --- a/languages/ru-RU/general/avatar.json +++ b/languages/ru-RU/general/avatar.json @@ -1,5 +1,5 @@ { "DESCRIPTION": "Возвращает аватар пользователя", - "USAGE": "avatar (@пользователь) (link)", - "EXAMPLES": "avatar\navatar @Jonny_Bro#4226\navatar link" + "USAGE": "avatar (@пользователь)", + "EXAMPLES": "avatar\navatar @Jonny_Bro#4226" } \ No newline at end of file diff --git a/languages/ru-RU/general/emoji.json b/languages/ru-RU/general/emoji.json index 1ade9a42..4d682148 100644 --- a/languages/ru-RU/general/emoji.json +++ b/languages/ru-RU/general/emoji.json @@ -3,7 +3,6 @@ "USAGE": "emoji [эмодзи]", "EXAMPLES": "emoji :tada:", "TITLE": "Информация об {{emoji}}", - "NAME": "Название", "ANIMATED": "Анимирован", "ID": "ID", "LINK": "Ссылка", diff --git a/languages/ru-RU/general/help.json b/languages/ru-RU/general/help.json index ffd78aa5..b6b68ee8 100644 --- a/languages/ru-RU/general/help.json +++ b/languages/ru-RU/general/help.json @@ -2,7 +2,6 @@ "DESCRIPTION": "Показать список команд или помощь по данной команде", "USAGE": "help (команда)", "EXAMPLES": "help\nhelp ping", - "NOT_FOUND": "Команды `{{search}}` не существует.", "COMMANDS_IN": "Доступные команды в категории `{{category}}`:", "FIELD_USAGE": "Использование", "FIELD_DESCRIPTION": "Описание", @@ -10,8 +9,8 @@ "FIELD_EXAMPLES": "Примеры", "NO_ALIAS": "Нет сокращений", "CMD_TITLE": "Помощь по {{cmd}}", - "INFO": "● Чтобы получить помощь по определённой команде используйте `help <команда>`!", + "INFO": "● Чтобы получить помощь по определённой команде используйте `help [команда]`!", "FIELD_PERMISSIONS": "Необходимые права", - "NO_REQUIRED_PERMISSION": "Никаких особых прав не нужно для использования данной команды.", + "NO_REQUIRED_PERMISSION": "Никаких особых прав не нужно.", "TITLE": "{{name}} | Команды" } \ No newline at end of file diff --git a/languages/ru-RU/general/remindme.json b/languages/ru-RU/general/remindme.json index ce0c3d2d..86469c17 100644 --- a/languages/ru-RU/general/remindme.json +++ b/languages/ru-RU/general/remindme.json @@ -1,9 +1,9 @@ { "DESCRIPTION": "Создать напоминание", "USAGE": "remindme [время] [сообщение]", - "EXAMPLES": "remindme 24h Использовать команду work\nremindme 3m Достать курицу из морозилки!", + "EXAMPLES": "remindme 12h Использовать команду work\nremindme 5m Достать курицу из морозилки!", "TIME": "Время (Например: 10s, 5m, 2h, 1d, 3w)", "SAVED": "Напоминание сохранено!", "TITLE": "Напоминание от JaBa", - "CREATED": "Сообщение создано {{time}}" + "CREATED": "Напоминание создано {{time}}" } \ No newline at end of file diff --git a/languages/ru-RU/general/serverinfo.json b/languages/ru-RU/general/serverinfo.json index e78d64ce..e7cb1b1d 100644 --- a/languages/ru-RU/general/serverinfo.json +++ b/languages/ru-RU/general/serverinfo.json @@ -5,5 +5,5 @@ "AFK_CHANNEL": "AFK канал", "BOOSTS": "Кол-во бустов", "LINK": "Статистика сервера", - "LINK_TEXT": "Нажмите сюда, чтобы открыть статистику сервера!" + "LINK_TEXT": "Нажмите сюда, чтобы открыть статистику сервера в панели управления!" } \ No newline at end of file diff --git a/languages/ru-RU/misc.json b/languages/ru-RU/misc.json index f0fdbf88..5674b40f 100644 --- a/languages/ru-RU/misc.json +++ b/languages/ru-RU/misc.json @@ -1,7 +1,8 @@ { - "CLICK_HERE": "Нажмите сюда, чтобы начать {{activity}} в {{channel}}", + "MORE_THAN_ZERO": "Укажите целое число больше 0!", + "OPTION_NAN_ALL": "Укажите целое число больше 0 или `all`!", "TIMES_UP": "Время вышло! Используйте команду снова!", - "SELECT_CANCELED": "Выбор отменён", + "SELECT_CANCELED": "Выбор отменён...", "INVALID_NUMBER_RANGE": "Укажите число от **{{min}}** до **{{max}}**!", "FORCE_STOP": "Игра принудительно окончена {{user}}, никто не победил!", "STATS_FOOTER": "● [Панель управления]({{dashboardLink}})\n● [Документация]({{docsLink}})\n● [Пригласить JaBa на свой сервер]({{inviteLink}})\n● [Поддержать]({{donateLink}}) (укажите ваш Discord тэг для выдачи ачивки, для других способов поддержки пишите в ЛС <@{{owner}}>)", diff --git a/languages/ru-RU/moderation/clear.json b/languages/ru-RU/moderation/clear.json index eec4f635..6ef121a7 100644 --- a/languages/ru-RU/moderation/clear.json +++ b/languages/ru-RU/moderation/clear.json @@ -1,11 +1,10 @@ { - "DESCRIPTION": "Удалить сообщения!", + "DESCRIPTION": "Очистка сообщений в канале", "USAGE": "clear [кол-во_сообщений] (@пользователь)", "EXAMPLES": "clear 10\r 10 @Jonny_Bro#4226\nclear all", - "OPTION_NAN": "Укажите целое число больше 0 или `all`", "OPTION": "Целое число / all", "ALL_CONFIRM": "**Все сообщения в канале будут удалены! Вы уверены?**", "CHANNEL_CLEARED": "Канал очищен!", - "CLEARED": "Было удалено **{{amount}}**!", - "CLEARED_MEMBER": "Было удалено **{{amount}}** от **{{username}}**!" + "CLEARED": "Было удалено {{amount}}!", + "CLEARED_MEMBER": "Было удалено {{amount}} от {{user}}!" } \ No newline at end of file diff --git a/languages/ru-RU/moderation/clearwarns.json b/languages/ru-RU/moderation/clearwarns.json index c5bc83e3..d303c9db 100644 --- a/languages/ru-RU/moderation/clearwarns.json +++ b/languages/ru-RU/moderation/clearwarns.json @@ -1,7 +1,6 @@ { - "DESCRIPTION": "Снять все предупреждения с пользователя!", + "DESCRIPTION": "Снять все предупреждения с пользователя", "USAGE": "clearwarns [@пользователь]", "EXAMPLES": "clearwarns @Jonny_Bro#4226", - "MISSING_MEMBER": "Вы должны упомянуть пользователя!", - "SUCCESS": "Предупреждения пользователя **{{username}}** удалены!" + "SUCCESS": "Предупреждения пользователя {{user}} удалены!" } \ No newline at end of file diff --git a/languages/ru-RU/moderation/giveaway.json b/languages/ru-RU/moderation/giveaway.json index d827c010..9a171ab1 100644 --- a/languages/ru-RU/moderation/giveaway.json +++ b/languages/ru-RU/moderation/giveaway.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Управление раздачами!", - "USAGE": "giveaway [create/reroll/delete/end] [время] [кол-во победителей] (Дроп? true) [приз]", - "EXAMPLES": "giveaway create 1d 2 100 рублей на карту!\ngiveaway create 1d 2 true 100 рублей на карту\ngiveaway reroll 597812898022031374", + "DESCRIPTION": "Управление раздачами", + "USAGE": "giveaway [create/reroll/delete/end] [время] [кол-во победителей] [приз] (Дроп?)", + "EXAMPLES": "giveaway create 1d 2 Discord Нитро!\ngiveaway create 1d 2 true Discord Нитро\ngiveaway reroll 597812898022031374", "INVALID_CREATE": "Какой-то из аргументов указан неверно, попробуйте снова!", "GIVEAWAY_ID": "ID сообщения раздачи", "WINNERS_COUNT": "Количество победителей", diff --git a/languages/ru-RU/moderation/poll.json b/languages/ru-RU/moderation/poll.json index ffd953a7..dca7f867 100644 --- a/languages/ru-RU/moderation/poll.json +++ b/languages/ru-RU/moderation/poll.json @@ -1,10 +1,8 @@ { - "DESCRIPTION": "Запустить опрос в текущем канале!", + "DESCRIPTION": "Запустить опрос в текущем канале", "USAGE": "poll [вопрос]", "EXAMPLES": "poll Земля плоская?", "QUESTION": "Текст вопроса", - "HERE": "@here", - "EVERYONE": "@everyone", "NOTHING": "Без упоминания", "SELECT_MENTION": "Выберите упоминание:", "POLL_SENDED": "Опрос отправлен", diff --git a/languages/ru-RU/moderation/warn.json b/languages/ru-RU/moderation/warn.json index 2c420310..fa6b7fc1 100644 --- a/languages/ru-RU/moderation/warn.json +++ b/languages/ru-RU/moderation/warn.json @@ -6,6 +6,6 @@ "MODAL_TITLE": "Выдать предупреждение {{nickname}}", "MODAL_REASON": "Причина предупреждения", "WARNED_DM": "Вы получили предупреждение на сервере **{{server}}** от пользователя **{{moderator}}** по причине **{{reason}}**!", - "WARNED": "**{{username}}** получил предупреждение по причине **{{reason}}**!", + "WARNED": "**{{user}}** получил предупреждение по причине **{{reason}}**!", "CASE": "Предупрежение | Номер #{{caseNumber}}" } \ No newline at end of file diff --git a/languages/ru-RU/moderation/warns.json b/languages/ru-RU/moderation/warns.json index 7dd84743..6669df43 100644 --- a/languages/ru-RU/moderation/warns.json +++ b/languages/ru-RU/moderation/warns.json @@ -1,5 +1,5 @@ { - "DESCRIPTION": "Показать список нарушений пользователя!", + "DESCRIPTION": "Показать список нарушений пользователя", "USAGE": "warns [@пользователь]", "EXAMPLES": "warns @Jonny_Bro#4226", "SANCTIONS_OF": "Нарушения {{member}}", diff --git a/languages/ru-RU/music/play.json b/languages/ru-RU/music/play.json index fabd257b..8fcc8c87 100644 --- a/languages/ru-RU/music/play.json +++ b/languages/ru-RU/music/play.json @@ -2,7 +2,7 @@ "DESCRIPTION": "Начать воспроизведение трека", "USAGE": "play [название-трека/ссылка]", "EXAMPLES": "play Never Gonna Give You Up", - "QUERY": "Название / Прямая ссылка / Ссылка на YouTube, Spotify или SoundCloud", + "QUERY": "Название / Прямая ссылка / Ссылка на YouTube или SoundCloud", "NO_VOICE_CHANNEL": "Вы должны находиться в голосовом канале!", "VOICE_CHANNEL_CONNECT": "Я не могу присоедениться к вашему голосовому каналу!", "RESULTS_FOOTER": "Укажите число от 1 до 10 (без префикса).", diff --git a/languages/ru-RU/nsfw/nsfw.json b/languages/ru-RU/nsfw/nsfw.json index ded013b6..fd341f55 100644 --- a/languages/ru-RU/nsfw/nsfw.json +++ b/languages/ru-RU/nsfw/nsfw.json @@ -1,6 +1,5 @@ { - "DESCRIPTION": "Найти NSFW изображение по тэгу", + "DESCRIPTION": "Получить NSFW изображение", "USAGE": "nsfw", - "EXAMPLES": "nsfw", - "TAG": "Тэг" + "EXAMPLES": "nsfw" } \ No newline at end of file diff --git a/languages/ru-RU/owner/announcement.json b/languages/ru-RU/owner/announcement.json index ce26621f..06f99361 100644 --- a/languages/ru-RU/owner/announcement.json +++ b/languages/ru-RU/owner/announcement.json @@ -1,7 +1,8 @@ { "DESCRIPTION": "Отправить объявление на все сервера где есть JaBa", - "USAGE": "announcement [текст]", - "EXAMPLES": "announcement Обновление v1.0!", + "USAGE": "announcement [текст] [true/false]", + "EXAMPLES": "announcement Обновление v1.0! true", + "TAG": "Подставить @everyone в сообщение?", "TOO_LONG": "Текст должен быть короче 1000 символов!", "TITLE": "📢 Объявление:", "SENDED": "Обновление отправлено на все сервера!" diff --git a/languages/ru-RU/owner/debug.json b/languages/ru-RU/owner/debug.json index 6cea945a..8c5ebe4a 100644 --- a/languages/ru-RU/owner/debug.json +++ b/languages/ru-RU/owner/debug.json @@ -1,6 +1,6 @@ { - "DESCRIPTION": "Позволяет изменять многие данные пользователя", - "USAGE": "[действие] [тип] [@пользователь] [значение]", + "DESCRIPTION": "Позволяет изменять данные пользователя", + "USAGE": "debug [set/add] [тип] [@пользователь] [значение]", "EXAMPLES": "debug set level @Jonny_Bro#4226 10000", "TYPE": "Тип данных", "SET": "Установить значение", diff --git a/languages/ru-RU/owner/reload.json b/languages/ru-RU/owner/reload.json index e3520e35..332a3e67 100644 --- a/languages/ru-RU/owner/reload.json +++ b/languages/ru-RU/owner/reload.json @@ -1,7 +1,7 @@ { - "DESCRIPTION": "Перезагрузить команду!", + "DESCRIPTION": "Перезагрузить команду", "COMMAND": "Команда", "EXAMPLES": "reload help", - "AVAILABLE_COMMANDS": "Доступные команды:", + "NOT_FOUND": "Команда `{{command}}` не найдена!", "SUCCESS": "Команда `{{command}}` успешно перезагружена!" } \ No newline at end of file diff --git a/languages/uk-UA/common.json b/languages/uk-UA/common.json index c84bf55b..c2e4fb5e 100644 --- a/languages/uk-UA/common.json +++ b/languages/uk-UA/common.json @@ -46,10 +46,10 @@ "PAGE": "Сторінка", "MESSAGE": "Повідомлення", "PROFILE": "Профіль", - "CONFIGURATION": "Налаштування", + "SETTINGS": "Налаштування", "LANGUAGE": "Мова", "CHANNEL": "Канал", - "UPDATE": "Обоновити", + "APPLY": "Обоновити", "SUGGESTIONS": "Пропозиції", "MODLOGS": "Логи модерації", "NO_CHANNEL": "Канал не обран", diff --git a/languages/uk-UA/economy/horserace.json b/languages/uk-UA/economy/horserace.json deleted file mode 100644 index 6b144d6c..00000000 --- a/languages/uk-UA/economy/horserace.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "DESCRIPTION": "Кінні перегони!", - "USAGE": "horserace [create/bet/go]", - "EXAMPLES": "horserace create\nhorserace bet 3 100", - "MISSING_STATUS": "Виберіть параметр: `create`, `bet` або `go`!", - "HORSE_NUM": "На перегонах всього 5 коней!", - "EMBED_T": "Кінні перегони", - "HORSE_NAME": "Кінь {{number}}", - "HORSE_VALUE": "Швидкість - {{speed}}\nПрибуток - *ставка* x **{{profit}}**", - "BET": "{{user}} поставив {{amount}} на коня **{{horse}}**!", - "NO_WINNERS": "Переміг кінь **{{horse}}**. Ніхто не виграв кредити!", - "WINNERS": "Переміг кінь **{{horse}}**. {{winners}}!", - "GAME_RUNNING": "Гра вже йде!", - "NO_GAME_RUNNING": "Гру не розпочато!" -} \ No newline at end of file diff --git a/languages/uk-UA/economy/profile.json b/languages/uk-UA/economy/profile.json index 3a56359b..87c0b89e 100644 --- a/languages/uk-UA/economy/profile.json +++ b/languages/uk-UA/economy/profile.json @@ -13,7 +13,7 @@ "GLOBAL": "🌍 Всього кредитів на всіх серверах", "REPUTATION": "🎩 Репутація", "LEVEL": "📊 Рівень", - "EXP": "🔮 Досвід", + "XP": "🔮 Досвід", "BIRTHDATE": "🎂 Дата народження", "NO_BIRTHDATE": "Дата народження не вказана", "LOVER": "❤ Друга половинка", diff --git a/languages/uk-UA/economy/transactions.json b/languages/uk-UA/economy/transactions.json index 59cf084f..958a672e 100644 --- a/languages/uk-UA/economy/transactions.json +++ b/languages/uk-UA/economy/transactions.json @@ -6,7 +6,6 @@ "EMBED_TRANSACTIONS": "Ваші транзакції", "BANK": "Банк", "NUMBERS": "Вгадай число", - "HORSERACE": "Кінні перегони", "TTT": "Хрестики-нуліки", "T_GOT": "Поповнення", "T_SEND": "Списання", diff --git a/languages/uk-UA/general/emoji.json b/languages/uk-UA/general/emoji.json index 4b4ffd7e..ffdd3818 100644 --- a/languages/uk-UA/general/emoji.json +++ b/languages/uk-UA/general/emoji.json @@ -3,7 +3,6 @@ "USAGE": "emoji [емодзі]", "EXAMPLES": "emoji :tada:", "TITLE": "Інформація про {{emoji}}", - "NAME": "Назва", "ANIMATED": "Анімований", "ID": "ID", "STANDART": "Стандартний емодзі" diff --git a/package-lock.json b/package-lock.json index 52766cd6..91d12d86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "jaba", - "version": "4.0pre5", + "version": "4.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jaba", - "version": "4.0pre5", + "version": "4.0", "license": "ISC", "dependencies": { "@discord-player/extractor": "^3.0.2", @@ -33,6 +33,7 @@ "libsodium-wrappers": "^0.7.10", "markdown-table": "2.0.0", "md5": "^2.2.1", + "mee6-levels-api": "^1.3.0", "moment": "^2.26.0", "mongoose": "^5.13.14", "ms": "^2.1.3", @@ -1496,6 +1497,11 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/duplexer3": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", + "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -3102,6 +3108,112 @@ "node": ">= 0.6" } }, + "node_modules/mee6-levels-api": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/mee6-levels-api/-/mee6-levels-api-1.3.0.tgz", + "integrity": "sha512-F7JjRPbTHARWzZavnkAJHCzS58C0Fhr4sf2Bae8N5LBay4bBUvNZbajbYrZ3eR08MuIUh7SSx+6+kl6L61BJiQ==", + "dependencies": { + "got": "^10.3.0" + } + }, + "node_modules/mee6-levels-api/node_modules/@sindresorhus/is": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz", + "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/mee6-levels-api/node_modules/cacheable-lookup": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz", + "integrity": "sha512-EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg==", + "dependencies": { + "@types/keyv": "^3.1.1", + "keyv": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mee6-levels-api/node_modules/decompress-response": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz", + "integrity": "sha512-TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw==", + "dependencies": { + "mimic-response": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mee6-levels-api/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mee6-levels-api/node_modules/got": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/got/-/got-10.7.0.tgz", + "integrity": "sha512-aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg==", + "dependencies": { + "@sindresorhus/is": "^2.0.0", + "@szmarczak/http-timer": "^4.0.0", + "@types/cacheable-request": "^6.0.1", + "cacheable-lookup": "^2.0.0", + "cacheable-request": "^7.0.1", + "decompress-response": "^5.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^5.0.0", + "lowercase-keys": "^2.0.0", + "mimic-response": "^2.1.0", + "p-cancelable": "^2.0.0", + "p-event": "^4.0.0", + "responselike": "^2.0.0", + "to-readable-stream": "^2.0.0", + "type-fest": "^0.10.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "node_modules/mee6-levels-api/node_modules/mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mee6-levels-api/node_modules/type-fest": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz", + "integrity": "sha512-EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -3540,6 +3652,39 @@ "node": ">=8" } }, + "node_modules/p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", + "dependencies": { + "p-timeout": "^3.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -4361,6 +4506,14 @@ "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" }, + "node_modules/to-readable-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz", + "integrity": "sha512-o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==", + "engines": { + "node": ">=8" + } + }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -5850,6 +6003,11 @@ "domhandler": "^4.2.0" } }, + "duplexer3": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz", + "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==" + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -7101,6 +7259,78 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "mee6-levels-api": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/mee6-levels-api/-/mee6-levels-api-1.3.0.tgz", + "integrity": "sha512-F7JjRPbTHARWzZavnkAJHCzS58C0Fhr4sf2Bae8N5LBay4bBUvNZbajbYrZ3eR08MuIUh7SSx+6+kl6L61BJiQ==", + "requires": { + "got": "^10.3.0" + }, + "dependencies": { + "@sindresorhus/is": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz", + "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==" + }, + "cacheable-lookup": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz", + "integrity": "sha512-EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg==", + "requires": { + "@types/keyv": "^3.1.1", + "keyv": "^4.0.0" + } + }, + "decompress-response": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz", + "integrity": "sha512-TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw==", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "got": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/got/-/got-10.7.0.tgz", + "integrity": "sha512-aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg==", + "requires": { + "@sindresorhus/is": "^2.0.0", + "@szmarczak/http-timer": "^4.0.0", + "@types/cacheable-request": "^6.0.1", + "cacheable-lookup": "^2.0.0", + "cacheable-request": "^7.0.1", + "decompress-response": "^5.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^5.0.0", + "lowercase-keys": "^2.0.0", + "mimic-response": "^2.1.0", + "p-cancelable": "^2.0.0", + "p-event": "^4.0.0", + "responselike": "^2.0.0", + "to-readable-stream": "^2.0.0", + "type-fest": "^0.10.0" + } + }, + "mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" + }, + "type-fest": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz", + "integrity": "sha512-EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==" + } + } + }, "memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", @@ -7413,6 +7643,27 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==" }, + "p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", + "requires": { + "p-timeout": "^3.1.0" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==" + }, + "p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "requires": { + "p-finally": "^1.0.0" + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -8029,6 +8280,11 @@ "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" }, + "to-readable-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz", + "integrity": "sha512-o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==" + }, "toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", diff --git a/package.json b/package.json index 9b796ef0..84c8115e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jaba", - "version": "4.0pre5", + "version": "4.0", "description": "My Discord Bot", "main": "index.js", "private": true, @@ -36,6 +36,7 @@ "libsodium-wrappers": "^0.7.10", "markdown-table": "2.0.0", "md5": "^2.2.1", + "mee6-levels-api": "^1.3.0", "moment": "^2.26.0", "mongoose": "^5.13.14", "ms": "^2.1.3",