From b6fee7f188a76209e638522c2ed7eb1f39442bd6 Mon Sep 17 00:00:00 2001 From: "Jonny_Bro (Nikita)" Date: Thu, 15 Jun 2023 19:46:27 +0500 Subject: [PATCH] v4.2.5 - https://github.com/JonnyBro/JaBa-logs Disabled memes and staff Localization changes --- commands/{Fun => !DISABLED}/memes.js | 5 +- commands/{General => !DISABLED}/staff.js | 5 +- commands/Administration/automod.js | 3 ++ commands/Administration/autorole.js | 15 ++++-- commands/Administration/config.js | 30 ++++++++--- commands/Administration/goodbye.js | 35 +++++++++--- commands/Administration/selectroles.js | 34 +++++++++--- commands/Administration/set.js | 20 +++++-- commands/Administration/setlang.js | 10 +++- commands/Administration/stealemoji.js | 10 +++- commands/Administration/welcome.js | 35 +++++++++--- commands/Economy/achievements.js | 10 +++- commands/Economy/bank.js | 17 ++++-- commands/Economy/birthdate.js | 69 +++++++++++------------- commands/Economy/divorce.js | 5 +- commands/Economy/leaderboard.js | 16 ++++-- commands/Economy/marry.js | 10 +++- commands/Economy/money.js | 10 +++- commands/Economy/pay.js | 17 ++++-- commands/Economy/profile.js | 10 +++- commands/Economy/rep.js | 11 +++- commands/Economy/rob.js | 15 ++++-- commands/Economy/setbio.js | 10 +++- commands/Economy/slots.js | 10 +++- commands/Economy/transactions.js | 10 +++- commands/Economy/work.js | 5 +- commands/Fun/8ball.js | 10 +++- commands/Fun/cat.js | 5 +- commands/Fun/crab.js | 5 +- commands/Fun/dog.js | 5 +- commands/Fun/lmgtfy.js | 25 ++++++--- commands/Fun/lovecalc.js | 17 ++++-- commands/Fun/number.js | 5 +- commands/Fun/tictactoe.js | 10 +++- commands/General/afk.js | 16 ++++-- commands/General/avatar.js | 22 +++++--- commands/General/boosters.js | 5 +- commands/General/emoji.js | 10 +++- commands/General/help.js | 10 +++- commands/General/minecraft.js | 10 +++- commands/General/ping.js | 5 +- commands/General/remindme.js | 15 ++++-- commands/General/report.js | 15 ++++-- commands/General/serverinfo.js | 5 +- commands/General/shorturl.js | 12 +++-- commands/General/stats.js | 4 ++ commands/General/suggest.js | 10 +++- commands/General/userinfo.js | 10 +++- commands/General/whois.js | 20 ++++--- commands/IAT/checkjar.js | 5 +- commands/Moderation/clear.js | 20 +++++-- commands/Moderation/clearwarns.js | 10 +++- commands/Moderation/giveaway.js | 60 ++++++++++++++++----- commands/Moderation/poll.js | 10 +++- commands/Moderation/unban.js | 10 +++- commands/Moderation/warns.js | 10 +++- commands/Music/back.js | 5 +- commands/Music/clips.js | 10 +++- commands/Music/loop.js | 9 +++- commands/Music/nowplaying.js | 5 +- commands/Music/play.js | 10 +++- commands/Music/queue.js | 5 +- commands/Music/seek.js | 10 +++- commands/Music/shuffle.js | 5 +- commands/Music/skip.js | 5 +- commands/Music/skipto.js | 12 +++-- commands/Music/stop.js | 5 +- commands/Music/volume.js | 10 +++- commands/NSFW/nsfw.js | 5 +- commands/Owner/announcement.js | 20 +++++-- commands/Owner/debug.js | 45 ++++++++++++---- commands/Owner/eval.js | 10 +++- commands/Owner/reload.js | 10 +++- commands/Owner/say.js | 15 ++++-- commands/Owner/servers.js | 5 +- dashboard/public/docs/updates.md | 10 ++++ languages/en-US/common.json | 3 +- languages/en-US/economy/birthdate.json | 15 +++++- languages/en-US/economy/leaderboard.json | 3 -- languages/en-US/general/avatar.json | 3 +- languages/en-US/general/shorturl.json | 3 +- languages/language-meta.json | 16 +++--- languages/ru-RU/common.json | 3 +- languages/ru-RU/economy/birthdate.json | 15 +++++- languages/ru-RU/economy/leaderboard.json | 3 -- languages/ru-RU/general/avatar.json | 3 +- languages/uk-UA/common.json | 3 +- languages/uk-UA/economy/birthdate.json | 15 +++++- languages/uk-UA/economy/leaderboard.json | 3 -- languages/uk-UA/general/avatar.json | 3 +- package.json | 2 +- 91 files changed, 844 insertions(+), 263 deletions(-) rename commands/{Fun => !DISABLED}/memes.js (93%) rename commands/{General => !DISABLED}/staff.js (91%) diff --git a/commands/Fun/memes.js b/commands/!DISABLED/memes.js similarity index 93% rename from commands/Fun/memes.js rename to commands/!DISABLED/memes.js index a505f29d..2da362f0 100644 --- a/commands/Fun/memes.js +++ b/commands/!DISABLED/memes.js @@ -12,7 +12,10 @@ class Memes extends BaseCommand { command: new SlashCommandBuilder() .setName("memes") .setDescription(client.translate("fun/memes:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/memes:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/memes:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/memes:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/General/staff.js b/commands/!DISABLED/staff.js similarity index 91% rename from commands/General/staff.js rename to commands/!DISABLED/staff.js index 366e8ae7..5eee8d12 100644 --- a/commands/General/staff.js +++ b/commands/!DISABLED/staff.js @@ -11,7 +11,10 @@ class Staff extends BaseCommand { command: new SlashCommandBuilder() .setName("staff") .setDescription(client.translate("general/staff:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/staff:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/staff:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/staff:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Administration/automod.js b/commands/Administration/automod.js index 44f6c29f..03b53b51 100644 --- a/commands/Administration/automod.js +++ b/commands/Administration/automod.js @@ -13,6 +13,7 @@ class Automod extends BaseCommand { .setDescription(client.translate("administration/automod:DESCRIPTION")) .setDescriptionLocalizations({ "uk": client.translate("administration/automod:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/automod:DESCRIPTION", null, "ru-RU"), }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) @@ -20,12 +21,14 @@ class Automod extends BaseCommand { .setDescription(client.translate("common:STATE")) .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA"), + "ru": client.translate("common:STATE", null, "ru-RU"), }) .setRequired(true)) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) .setDescriptionLocalizations({ "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), }) .addChannelTypes(ChannelType.GuildText)), aliases: [], diff --git a/commands/Administration/autorole.js b/commands/Administration/autorole.js index 3ba18aed..e2025744 100644 --- a/commands/Administration/autorole.js +++ b/commands/Administration/autorole.js @@ -11,16 +11,25 @@ class Autorole extends BaseCommand { command: new SlashCommandBuilder() .setName("autorole") .setDescription(client.translate("administration/autorole:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/autorole:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/autorole:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/autorole:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addBooleanOption(option => option.setName("state") .setDescription(client.translate("common:STATE")) - .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:STATE", null, "uk-UA"), + "ru": client.translate("common:STATE", null, "ru-RU"), + }) .setRequired(true)) .addRoleOption(option => option.setName("role") .setDescription(client.translate("common:ROLE")) - .setDescriptionLocalizations({ "uk": client.translate("common:ROLE", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:ROLE", null, "uk-UA"), + "ru": client.translate("common:ROLE", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Administration/config.js b/commands/Administration/config.js index 3332133a..7097f46a 100644 --- a/commands/Administration/config.js +++ b/commands/Administration/config.js @@ -11,19 +11,31 @@ class Config extends BaseCommand { command: new SlashCommandBuilder() .setName("config") .setDescription(client.translate("administration/config:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/config:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/config:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/config:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addSubcommand(subcommand => subcommand.setName("list") .setDescription(client.translate("administration/config:LIST")) - .setDescriptionLocalizations({ "uk": client.translate("administration/config:LIST", null, "uk-UA") }), + .setDescriptionLocalizations({ + "uk": client.translate("administration/config:LIST", null, "uk-UA"), + "ru": client.translate("administration/config:LIST", null, "ru-RU"), + }), ) .addSubcommand(subcommand => subcommand.setName("set") .setDescription(client.translate("administration/config:SET")) - .setDescriptionLocalizations({ "uk": client.translate("administration/config:SET", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/config:SET", null, "uk-UA"), + "ru": client.translate("administration/config:SET", null, "ru-RU"), + }) .addStringOption(option => option.setName("setting") .setDescription(client.translate("administration/config:SETTING")) - .setDescriptionLocalizations({ "uk": client.translate("administration/config:SETTING", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/config:SETTING", null, "uk-UA"), + "ru": client.translate("administration/config:SETTING", null, "ru-RU"), + }) .setChoices( { name: client.translate("administration/config:BIRTHDAYS"), value: "birthdays" }, { name: client.translate("administration/config:MODLOGS"), value: "modlogs" }, @@ -34,11 +46,17 @@ class Config extends BaseCommand { .setRequired(true)) .addBooleanOption(option => option.setName("state") .setDescription(client.translate("common:STATE")) - .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:STATE", null, "uk-UA"), + "ru": client.translate("common:STATE", null, "ru-RU"), + }) .setRequired(true)) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) - .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), + })), ), aliases: [], dirname: __dirname, diff --git a/commands/Administration/goodbye.js b/commands/Administration/goodbye.js index 79cff1c5..52d2fcdf 100644 --- a/commands/Administration/goodbye.js +++ b/commands/Administration/goodbye.js @@ -11,29 +11,50 @@ class Goodbye extends BaseCommand { command: new SlashCommandBuilder() .setName("goodbye") .setDescription(client.translate("administration/goodbye:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/goodbye:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addSubcommand(subcommand => subcommand.setName("test") .setDescription(client.translate("administration/goodbye:TEST")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:TEST", null, "uk-UA") }), + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:TEST", null, "uk-UA"), + "ru": client.translate("administration/goodbye:TEST", null, "ru-RU"), + }), ) .addSubcommand(subcommand => subcommand.setName("config") .setDescription(client.translate("administration/goodbye:CONFIG")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:CONFIG", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:CONFIG", null, "uk-UA"), + "ru": client.translate("administration/goodbye:CONFIG", null, "ru-RU"), + }) .addBooleanOption(option => option.setName("state") .setDescription(client.translate("common:STATE")) - .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:STATE", null, "uk-UA"), + "ru": client.translate("common:STATE", null, "ru-RU"), + }) .setRequired(true)) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) - .setDescriptionLocalizations({ "uk": client.translate("common:CHANNEL", null, "uk-UA") })) + .setDescriptionLocalizations({ + "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), + })) .addStringOption(option => option.setName("message") .setDescription(client.translate("administration/goodbye:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") })) + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:MESSAGE", null, "uk-UA"), + "ru": client.translate("administration/goodbye:MESSAGE", null, "ru-RU"), + })) .addBooleanOption(option => option.setName("image") .setDescription(client.translate("administration/goodbye:IMAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:IMAGE", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:IMAGE", null, "uk-UA"), + "ru": client.translate("administration/goodbye:IMAGE", null, "ru-RU"), + })), ), aliases: [], dirname: __dirname, diff --git a/commands/Administration/selectroles.js b/commands/Administration/selectroles.js index 7a3c5056..f6f80b4a 100644 --- a/commands/Administration/selectroles.js +++ b/commands/Administration/selectroles.js @@ -11,30 +11,52 @@ class Selectroles extends BaseCommand { command: new SlashCommandBuilder() .setName("selectroles") .setDescription(client.translate("administration/selectroles:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/selectroles:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/selectroles:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/selectroles:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addSubcommand(subcommand => subcommand.setName("message") .setDescription(client.translate("administration/selectroles:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("administration/selectroles:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/selectroles:MESSAGE", null, "uk-UA"), + "ru": client.translate("administration/selectroles:MESSAGE", null, "ru-RU"), + }) .addStringOption(option => option.setName("text") .setDescription(client.translate("common:MESSAGE")) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)), ) .addSubcommand(subcommand => subcommand.setName("addrole") .setDescription(client.translate("administration/selectroles:ADDROLE")) - .setDescriptionLocalizations({ "uk": client.translate("administration/selectroles:ADDROLE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/selectroles:ADDROLE", null, "uk-UA"), + "ru": client.translate("administration/selectroles:ADDROLE", null, "ru-RU"), + }) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) - .setDescriptionLocalizations({ "uk": client.translate("common:CHANNEL", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), + }) .setRequired(true)) .addStringOption(option => option.setName("message_id") .setDescription(client.translate("common:MESSAGE_ID")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE_ID", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE_ID", null, "uk-UA"), + "ru": client.translate("common:MESSAGE_ID", null, "ru-RU"), + }) .setRequired(true)) .addRoleOption(option => option.setName("role") .setDescription(client.translate("common:ROLE")) - .setDescriptionLocalizations({ "uk": client.translate("common:ROLE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:ROLE", null, "uk-UA"), + "ru": client.translate("common:ROLE", null, "ru-RU"), + }) .setRequired(true)), ), aliases: [], diff --git a/commands/Administration/set.js b/commands/Administration/set.js index 708c6c9c..a6bd97b8 100644 --- a/commands/Administration/set.js +++ b/commands/Administration/set.js @@ -11,12 +11,18 @@ class Set extends BaseCommand { command: new SlashCommandBuilder() .setName("set") .setDescription(client.translate("administration/set:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/set:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/set:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/set:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addStringOption(option => option.setName("type") .setDescription(client.translate("owner/debug:TYPE")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:TYPE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:TYPE", null, "uk-UA"), + "ru": client.translate("owner/debug:TYPE", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: client.translate("common:LEVEL"), value: "level" }, @@ -26,11 +32,17 @@ class Set extends BaseCommand { )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("int") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Administration/setlang.js b/commands/Administration/setlang.js index 619c82d5..446830c4 100644 --- a/commands/Administration/setlang.js +++ b/commands/Administration/setlang.js @@ -11,12 +11,18 @@ class Setlang extends BaseCommand { command: new SlashCommandBuilder() .setName("setlang") .setDescription(client.translate("administration/setlang:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/setlang:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/setlang:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/setlang:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addStringOption(option => option.setName("language") .setDescription(client.translate("common:LANGUAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:LANGUAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:LANGUAGE", null, "uk-UA"), + "ru": client.translate("common:LANGUAGE", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: "English", value: "en-US" }, diff --git a/commands/Administration/stealemoji.js b/commands/Administration/stealemoji.js index b94e47eb..80b53504 100644 --- a/commands/Administration/stealemoji.js +++ b/commands/Administration/stealemoji.js @@ -11,12 +11,18 @@ class Stealemoji extends BaseCommand { command: new SlashCommandBuilder() .setName("stealemoji") .setDescription(client.translate("administration/stealemoji:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/stealemoji:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/stealemoji:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/stealemoji:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addStringOption(option => option.setName("emoji") .setDescription(client.translate("common:EMOJI")) - .setDescriptionLocalizations({ "uk": client.translate("common:EMOJI", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:EMOJI", null, "uk-UA"), + "ru": client.translate("common:EMOJI", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Administration/welcome.js b/commands/Administration/welcome.js index 8310e3fd..778b3d54 100644 --- a/commands/Administration/welcome.js +++ b/commands/Administration/welcome.js @@ -11,29 +11,50 @@ class Welcome extends BaseCommand { command: new SlashCommandBuilder() .setName("welcome") .setDescription(client.translate("administration/welcome:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("administration/welcome:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/welcome:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("administration/welcome:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.Administrator) .addSubcommand(subcommand => subcommand.setName("test") .setDescription(client.translate("administration/goodbye:TEST")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:TEST", null, "uk-UA") }), + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:TEST", null, "uk-UA"), + "ru": client.translate("administration/goodbye:TEST", null, "ru-RU"), + }), ) .addSubcommand(subcommand => subcommand.setName("config") .setDescription(client.translate("administration/goodbye:CONFIG")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:CONFIG", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:CONFIG", null, "uk-UA"), + "ru": client.translate("administration/goodbye:CONFIG", null, "ru-RU"), + }) .addBooleanOption(option => option.setName("state") .setDescription(client.translate("common:STATE")) - .setDescriptionLocalizations({ "uk": client.translate("common:STATE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:STATE", null, "uk-UA"), + "ru": client.translate("common:STATE", null, "ru-RU"), + }) .setRequired(true)) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) - .setDescriptionLocalizations({ "uk": client.translate("common:CHANNEL", null, "uk-UA") })) + .setDescriptionLocalizations({ + "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), + })) .addStringOption(option => option.setName("message") .setDescription(client.translate("administration/goodbye:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:MESSAGE", null, "uk-UA") })) + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:MESSAGE", null, "uk-UA"), + "ru": client.translate("administration/goodbye:MESSAGE", null, "ru-RU"), + })) .addBooleanOption(option => option.setName("image") .setDescription(client.translate("administration/goodbye:IMAGE")) - .setDescriptionLocalizations({ "uk": client.translate("administration/goodbye:IMAGE", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("administration/goodbye:IMAGE", null, "uk-UA"), + "ru": client.translate("administration/goodbye:IMAGE", null, "ru-RU"), + })), ), aliases: [], dirname: __dirname, diff --git a/commands/Economy/achievements.js b/commands/Economy/achievements.js index 4be97dfc..8317c783 100644 --- a/commands/Economy/achievements.js +++ b/commands/Economy/achievements.js @@ -11,11 +11,17 @@ class Achievements extends BaseCommand { command: new SlashCommandBuilder() .setName("achievements") .setDescription(client.translate("economy/achievements:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/achievements:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/achievements:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/achievements:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Economy/bank.js b/commands/Economy/bank.js index 153d154d..da217160 100644 --- a/commands/Economy/bank.js +++ b/commands/Economy/bank.js @@ -11,11 +11,17 @@ class Bank extends BaseCommand { command: new SlashCommandBuilder() .setName("bank") .setDescription(client.translate("economy/bank:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/bank:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/bank:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/bank:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("option") .setDescription(client.translate("economy/bank:OPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/bank:OPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/bank:OPTION", null, "uk-UA"), + "ru": client.translate("economy/bank:OPTION", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: client.translate("economy/bank:DEPOSIT"), value: "deposit" }, @@ -23,7 +29,10 @@ class Bank extends BaseCommand { )) .addStringOption(option => option.setName("credits") .setDescription(client.translate("misc:OPTION_NAN_ALL")) - .setDescriptionLocalizations({ "uk": client.translate("misc:OPTION_NAN_ALL", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("misc:OPTION_NAN_ALL", null, "uk-UA"), + "ru": client.translate("misc:OPTION_NAN_ALL", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -47,7 +56,7 @@ class Bank extends BaseCommand { const choice = interaction.options.getString("option"); if (choice === "deposit") { - const credits = interaction.options.getString("credits") === "all" ? data.memberData.money : interaction.options.getString("credits"); + const credits = interaction.options.getString("credits").toLowerCase() === "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.functions.getNoun(credits, interaction.translate("misc:NOUNS:CREDIT:1"), interaction.translate("misc:NOUNS:CREDIT:2"), interaction.translate("misc:NOUNS:CREDIT:5"))}` }); diff --git a/commands/Economy/birthdate.js b/commands/Economy/birthdate.js index 80ae9455..1bb3bc75 100644 --- a/commands/Economy/birthdate.js +++ b/commands/Economy/birthdate.js @@ -11,35 +11,46 @@ class Birthdate extends BaseCommand { command: new SlashCommandBuilder() .setName("birthdate") .setDescription(client.translate("economy/birthdate:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/birthdate:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/birthdate:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/birthdate:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addIntegerOption(option => option.setName("day") .setDescription(client.translate("economy/birthdate:DAY")) - .setDescriptionLocalizations({ "uk": client.translate("economy/birthdate:DAY", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/birthdate:DAY", null, "uk-UA"), + "ru": client.translate("economy/birthdate:DAY", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("month") .setDescription(client.translate("economy/birthdate:MONTH")) - .setDescriptionLocalizations({ "uk": client.translate("economy/birthdate:MONTH", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/birthdate:MONTH", null, "uk-UA"), + "ru": client.translate("economy/birthdate:MONTH", null, "ru-RU"), + }) .setRequired(true) .setChoices( - { name: "Январь", value: 1 }, - { name: "Февраль", value: 2 }, - { name: "Март", value: 3 }, - { name: "Апрель", value: 4 }, - { name: "Май", value: 5 }, - { name: "Июнь", value: 6 }, - { name: "Июль", value: 7 }, - { name: "Август", value: 8 }, - { name: "Сентябрь", value: 9 }, - { name: "Октябрь", value: 10 }, - { name: "Ноябрь", value: 11 }, - { name: "Декабрь", value: 12 }, + { name: client.translate("economy/birthdate:JANUARY"), value: 1 }, + { name: client.translate("economy/birthdate:FEBRUARY"), value: 2 }, + { name: client.translate("economy/birthdate:MARCH"), value: 3 }, + { name: client.translate("economy/birthdate:APRIL"), value: 4 }, + { name: client.translate("economy/birthdate:MAY"), value: 5 }, + { name: client.translate("economy/birthdate:JUNE"), value: 6 }, + { name: client.translate("economy/birthdate:JULY"), value: 7 }, + { name: client.translate("economy/birthdate:AUGUST"), value: 8 }, + { name: client.translate("economy/birthdate:SEPTEMBER"), value: 9 }, + { name: client.translate("economy/birthdate:OCTOBER"), value: 10 }, + { name: client.translate("economy/birthdate:NOVEMBER"), value: 11 }, + { name: client.translate("economy/birthdate:DECEMBER"), value: 12 }, )) .addIntegerOption(option => option.setName("year") .setDescription(client.translate("economy/birthdate:YEAR")) - .setDescriptionLocalizations({ "uk": client.translate("economy/birthdate:YEAR", null, "uk-UA") }) - .setRequired(true) - .setAutocomplete(true)), + .setDescriptionLocalizations({ + "uk": client.translate("economy/birthdate:YEAR", null, "uk-UA"), + "ru": client.translate("economy/birthdate:YEAR", null, "ru-RU"), + }) + .setRequired(true)), aliases: [], dirname: __dirname, ownerOnly: false, @@ -61,9 +72,9 @@ class Birthdate extends BaseCommand { async execute(client, interaction, data) { const day = interaction.options.getInteger("day"), month = interaction.options.getInteger("month"), - year = interaction.options.getInteger("year"); + year = interaction.options.getInteger("year"), + d = new Date(year, month - 1, day); - 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"); @@ -75,24 +86,6 @@ class Birthdate extends BaseCommand { date: client.functions.printDate(client, d), }); } - - /** - * - * @param {import("../../base/JaBa")} client - * @param {import("discord.js").AutocompleteInteraction} interaction - * @returns - */ - async autocompleteRun(client, interaction) { - const int = interaction.options.getInteger("year"), - results = Array.from({ length: (2023 - 1900) / 1 }, (_, i) => 1900 + i * 1).filter(i => i.toString().includes(int)); - - return interaction.respond( - results.slice(0, 25).map(i => ({ - name: i, - value: i, - }), - )); - } } module.exports = Birthdate; \ No newline at end of file diff --git a/commands/Economy/divorce.js b/commands/Economy/divorce.js index 97b29df4..f7315953 100644 --- a/commands/Economy/divorce.js +++ b/commands/Economy/divorce.js @@ -11,7 +11,10 @@ class Divorce extends BaseCommand { command: new SlashCommandBuilder() .setName("divorce") .setDescription(client.translate("economy/divorce:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/divorce:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/divorce:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/divorce:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Economy/leaderboard.js b/commands/Economy/leaderboard.js index 4df7b45d..a261ae65 100644 --- a/commands/Economy/leaderboard.js +++ b/commands/Economy/leaderboard.js @@ -11,16 +11,22 @@ class Leaderboard extends BaseCommand { command: new SlashCommandBuilder() .setName("leaderboard") .setDescription(client.translate("economy/leaderboard:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/leaderboard:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/leaderboard:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/leaderboard:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("type") .setDescription(client.translate("owner/debug:TYPE")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:TYPE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:TYPE", null, "uk-UA"), + "ru": client.translate("owner/debug:TYPE", null, "ru-RU"), + }) .setRequired(true) .setChoices( - { name: client.translate("economy/leaderboard:LEVEL"), value: "level" }, - { name: client.translate("economy/leaderboard:MONEY"), value: "money" }, - { name: client.translate("economy/leaderboard:REP"), value: "rep" }, + { name: client.translate("common:LEVEL"), value: "level" }, + { name: client.translate("common:MONEY"), value: "money" }, + { name: client.translate("common:REP"), value: "rep" }, )), aliases: [], dirname: __dirname, diff --git a/commands/Economy/marry.js b/commands/Economy/marry.js index d503a006..e05fdbb2 100644 --- a/commands/Economy/marry.js +++ b/commands/Economy/marry.js @@ -12,11 +12,17 @@ class Marry extends BaseCommand { command: new SlashCommandBuilder() .setName("marry") .setDescription(client.translate("economy/marry:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/marry:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/marry:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/marry:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Economy/money.js b/commands/Economy/money.js index f565762e..b6774512 100644 --- a/commands/Economy/money.js +++ b/commands/Economy/money.js @@ -11,11 +11,17 @@ class Money extends BaseCommand { command: new SlashCommandBuilder() .setName("money") .setDescription(client.translate("economy/money:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/money:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/money:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/money:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Economy/pay.js b/commands/Economy/pay.js index be141403..e0cddc39 100644 --- a/commands/Economy/pay.js +++ b/commands/Economy/pay.js @@ -11,15 +11,24 @@ class Pay extends BaseCommand { command: new SlashCommandBuilder() .setName("pay") .setDescription(client.translate("economy/pay:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/pay:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/pay:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/pay:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("amount") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -59,7 +68,7 @@ class Pay extends BaseCommand { await data.memberData.save(); memberData.money += amount; - memberData.save(); + await memberData.save(); const info1 = { user: member.user.discriminator === "0" ? member.user.username : member.user.tag, diff --git a/commands/Economy/profile.js b/commands/Economy/profile.js index a75bd7b9..f875cc5e 100644 --- a/commands/Economy/profile.js +++ b/commands/Economy/profile.js @@ -11,11 +11,17 @@ class Profile extends BaseCommand { command: new SlashCommandBuilder() .setName("profile") .setDescription(client.translate("economy/profile:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/profile:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/profile:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/profile:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Economy/rep.js b/commands/Economy/rep.js index 2cec0a2b..ba83fa94 100644 --- a/commands/Economy/rep.js +++ b/commands/Economy/rep.js @@ -11,11 +11,17 @@ class Rep extends BaseCommand { command: new SlashCommandBuilder() .setName("rep") .setDescription(client.translate("economy/rep:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/rep:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/rep:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/rep:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -57,6 +63,7 @@ class Rep extends BaseCommand { const userData = await client.findOrCreateUser({ id: user.id, }); + userData.rep++; if (!userData.achievements.rep.achieved) { diff --git a/commands/Economy/rob.js b/commands/Economy/rob.js index abb50ef1..3e833229 100644 --- a/commands/Economy/rob.js +++ b/commands/Economy/rob.js @@ -11,15 +11,24 @@ class Rob extends BaseCommand { command: new SlashCommandBuilder() .setName("rob") .setDescription(client.translate("economy/rob:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/rob:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/rob:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/rob:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("amount") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Economy/setbio.js b/commands/Economy/setbio.js index f6c3697f..254ac382 100644 --- a/commands/Economy/setbio.js +++ b/commands/Economy/setbio.js @@ -11,11 +11,17 @@ class Setbio extends BaseCommand { command: new SlashCommandBuilder() .setName("setbio") .setDescription(client.translate("economy/setbio:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/setbio:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/setbio:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/setbio:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("text") .setDescription(client.translate("economy/profile:BIO")) - .setDescriptionLocalizations({ "uk": client.translate("economy/profile:BIO", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/profile:BIO", null, "uk-UA"), + "ru": client.translate("economy/profile:BIO", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Economy/slots.js b/commands/Economy/slots.js index 42b36ad2..061e39a8 100644 --- a/commands/Economy/slots.js +++ b/commands/Economy/slots.js @@ -11,11 +11,17 @@ class Slots extends BaseCommand { command: new SlashCommandBuilder() .setName("slots") .setDescription(client.translate("economy/slots:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/slots:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/slots:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/slots:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addIntegerOption(option => option.setName("amount") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Economy/transactions.js b/commands/Economy/transactions.js index 625b669f..7e473669 100644 --- a/commands/Economy/transactions.js +++ b/commands/Economy/transactions.js @@ -11,11 +11,17 @@ class Transactions extends BaseCommand { command: new SlashCommandBuilder() .setName("transactions") .setDescription(client.translate("economy/transactions:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/transactions:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/transactions:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/transactions:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addBooleanOption(option => option.setName("clear") .setDescription(client.translate("economy/transactions:CLEAR")) - .setDescriptionLocalizations({ "uk": client.translate("economy/transactions:CLEAR", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("economy/transactions:CLEAR", null, "uk-UA"), + "ru": client.translate("economy/transactions:CLEAR", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Economy/work.js b/commands/Economy/work.js index e172e5b8..2f6b1253 100644 --- a/commands/Economy/work.js +++ b/commands/Economy/work.js @@ -11,7 +11,10 @@ class Work extends BaseCommand { command: new SlashCommandBuilder() .setName("work") .setDescription(client.translate("economy/work:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("economy/work:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("economy/work:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("economy/work:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js index a599891b..0e5c143c 100644 --- a/commands/Fun/8ball.js +++ b/commands/Fun/8ball.js @@ -11,11 +11,17 @@ class Eightball extends BaseCommand { command: new SlashCommandBuilder() .setName("8ball") .setDescription(client.translate("fun/8ball:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/8ball:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/8ball:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/8ball:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("question") .setDescription(client.translate("fun/8ball:QUESTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/8ball:QUESTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/8ball:QUESTION", null, "uk-UA"), + "ru": client.translate("fun/8ball:QUESTION", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Fun/cat.js b/commands/Fun/cat.js index 85ce7040..aabd2822 100644 --- a/commands/Fun/cat.js +++ b/commands/Fun/cat.js @@ -12,7 +12,10 @@ class Cat extends BaseCommand { command: new SlashCommandBuilder() .setName("cat") .setDescription(client.translate("fun/cat:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/cat:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/cat:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/cat:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/Fun/crab.js b/commands/Fun/crab.js index 74e3ebc4..ad4f41ce 100644 --- a/commands/Fun/crab.js +++ b/commands/Fun/crab.js @@ -12,7 +12,10 @@ class Crab extends BaseCommand { command: new SlashCommandBuilder() .setName("crab") .setDescription(client.translate("fun/crab:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/crab:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/crab:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/crab:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/Fun/dog.js b/commands/Fun/dog.js index 8531ed4a..5dd2f404 100644 --- a/commands/Fun/dog.js +++ b/commands/Fun/dog.js @@ -12,7 +12,10 @@ class Dog extends BaseCommand { command: new SlashCommandBuilder() .setName("dog") .setDescription(client.translate("fun/dog:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/dog:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/dog:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/dog:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/Fun/lmgtfy.js b/commands/Fun/lmgtfy.js index 5e75fd1f..25452a3e 100644 --- a/commands/Fun/lmgtfy.js +++ b/commands/Fun/lmgtfy.js @@ -12,15 +12,24 @@ class LMGTFY extends BaseCommand { command: new SlashCommandBuilder() .setName("lmgtfy") .setDescription(client.translate("fun/lmgtfy:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/lmgtfy:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/lmgtfy:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/lmgtfy:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("query") .setDescription(client.translate("fun/lmgtfy:QUERY")) - .setDescriptionLocalizations({ "uk": client.translate("fun/lmgtfy:QUERY", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/lmgtfy:QUERY", null, "uk-UA"), + "ru": client.translate("fun/lmgtfy:QUERY", null, "ru-RU"), + }) .setRequired(true)) .addBooleanOption(option => option.setName("short") .setDescription(client.translate("fun/lmgtfy:SHORT")) - .setDescriptionLocalizations({ "uk": client.translate("fun/lmgtfy:SHORT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/lmgtfy:SHORT", null, "uk-UA"), + "ru": client.translate("fun/lmgtfy:SHORT", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -41,6 +50,8 @@ class LMGTFY extends BaseCommand { * @param {Object} data */ async execute(client, interaction) { + await interaction.deferReply({ ephemeral: true }); + const query = interaction.options.getString("query").replace(/[' '_]/g, "+"), short = interaction.options.getBoolean("short"), url = `https://letmegooglethat.com/?q=${query}`; @@ -48,14 +59,12 @@ class LMGTFY extends BaseCommand { if (short) { const res = await fetch(`https://is.gd/create.php?format=simple&url=${encodeURIComponent(url)}`).then(res => res.text()); - interaction.reply({ + interaction.editReply({ content: `<${res}>`, - ephemeral: true, }); } else { - interaction.reply({ - content: `\`\`\`<${url}>\`\`\``, - ephemeral: true, + interaction.editReply({ + content: `<${url}>`, }); } } diff --git a/commands/Fun/lovecalc.js b/commands/Fun/lovecalc.js index 14fef484..9679f4a2 100644 --- a/commands/Fun/lovecalc.js +++ b/commands/Fun/lovecalc.js @@ -12,17 +12,26 @@ class Lovecalc extends BaseCommand { command: new SlashCommandBuilder() .setName("lovecalc") .setDescription(client.translate("fun/lovecalc:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/lovecalc:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/lovecalc:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/lovecalc:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("first_member") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addUserOption(option => option.setName("second_member") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, @@ -52,7 +61,7 @@ class Lovecalc extends BaseCommand { .split("") .filter(e => !isNaN(e)) .join(""); - const percent = parseInt(string.substr(0, 2), 10); + const percent = parseInt(string.slice(0, 2), 10); const embed = new EmbedBuilder() .setAuthor({ diff --git a/commands/Fun/number.js b/commands/Fun/number.js index 1152cd26..a776018e 100644 --- a/commands/Fun/number.js +++ b/commands/Fun/number.js @@ -12,7 +12,10 @@ class Number extends BaseCommand { command: new SlashCommandBuilder() .setName("number") .setDescription(client.translate("fun/number:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/number:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/number:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/number:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Fun/tictactoe.js b/commands/Fun/tictactoe.js index 9fb944e4..e3ef5c59 100644 --- a/commands/Fun/tictactoe.js +++ b/commands/Fun/tictactoe.js @@ -12,11 +12,17 @@ class TicTacToe extends BaseCommand { command: new SlashCommandBuilder() .setName("tictactoe") .setDescription(client.translate("fun/tictactoe:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("fun/tictactoe:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("fun/tictactoe:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("fun/tictactoe:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/afk.js b/commands/General/afk.js index 5e33ca05..bb8a28c2 100644 --- a/commands/General/afk.js +++ b/commands/General/afk.js @@ -11,11 +11,17 @@ class Afk extends BaseCommand { command: new SlashCommandBuilder() .setName("afk") .setDescription(client.translate("general/afk:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/afk:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/afk:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/afk:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -36,14 +42,16 @@ class Afk extends BaseCommand { * @param {Object} data */ async execute(client, interaction, data) { + interaction.deferReply({ ephemeral: true }); + const reason = interaction.options.getString("message"); data.userData.afk = reason; - data.userData.save(); + await data.userData.save(); interaction.success("general/afk:SUCCESS", { reason, - }, { ephemeral: true }); + }, { edit: true }); } } diff --git a/commands/General/avatar.js b/commands/General/avatar.js index 5f787d82..77f7b4c0 100644 --- a/commands/General/avatar.js +++ b/commands/General/avatar.js @@ -11,11 +11,23 @@ class Avatar extends BaseCommand { command: new SlashCommandBuilder() .setName("avatar") .setDescription(client.translate("general/avatar:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/avatar:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/avatar:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/avatar:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })) + .addBooleanOption(option => option.setName("server") + .setDescription(client.translate("general/avatar:SERVER")) + .setDescriptionLocalizations({ + "uk": client.translate("general/avatar:SERVER", null, "uk-UA"), + "ru": client.translate("general/avatar:SERVER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, @@ -35,10 +47,8 @@ class Avatar extends BaseCommand { * @param {Object} data */ async execute(client, interaction) { - const user = interaction.options.getUser("user") || interaction.user; - const avatarURL = user.displayAvatarURL({ - size: 512, - }); + const member = interaction.options.getMember("user") || interaction.member; + const avatarURL = interaction.options.getBoolean("server") ? member.avatarURL({ size: 512 }) : member.user.avatarURL({ size: 512 }); interaction.reply({ files: [{ diff --git a/commands/General/boosters.js b/commands/General/boosters.js index f2b098b4..661f14f8 100644 --- a/commands/General/boosters.js +++ b/commands/General/boosters.js @@ -11,7 +11,10 @@ class Boosters extends BaseCommand { command: new SlashCommandBuilder() .setName("boosters") .setDescription(client.translate("general/boosters:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/boosters:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/boosters:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/boosters:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/General/emoji.js b/commands/General/emoji.js index cc7e173e..3308f830 100644 --- a/commands/General/emoji.js +++ b/commands/General/emoji.js @@ -11,11 +11,17 @@ class Emoji extends BaseCommand { command: new SlashCommandBuilder() .setName("emoji") .setDescription(client.translate("general/emoji:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/emoji:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/emoji:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/emoji:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("emoji") .setDescription(client.translate("common:EMOJI")) - .setDescriptionLocalizations({ "uk": client.translate("commom:EMOJI", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("commom:EMOJI", null, "uk-UA"), + "ru": client.translate("common:EMOJI", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/help.js b/commands/General/help.js index 75c37d41..0c6a0db8 100644 --- a/commands/General/help.js +++ b/commands/General/help.js @@ -11,12 +11,18 @@ class Help extends BaseCommand { command: new SlashCommandBuilder() .setName("help") .setDescription(client.translate("general/help:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/help:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/help:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/help:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("command") .setDescription(client.translate("common:COMMAND")) - .setDescriptionLocalizations({ "uk": client.translate("common:COMMAND", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:COMMAND", null, "uk-UA"), + "ru": client.translate("common:COMMAND", null, "ru-RU"), + }) .setAutocomplete(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/minecraft.js b/commands/General/minecraft.js index 9df0b71c..7db4502b 100644 --- a/commands/General/minecraft.js +++ b/commands/General/minecraft.js @@ -12,11 +12,17 @@ class Minecraft extends BaseCommand { command: new SlashCommandBuilder() .setName("minecraft") .setDescription(client.translate("general/minecraft:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/minecraft:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/minecraft:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/minecraft:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("ip") .setDescription(client.translate("common:IP")) - .setDescriptionLocalizations({ "uk": client.translate("common:IP", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:IP", null, "uk-UA"), + "ru": client.translate("common:IP", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/ping.js b/commands/General/ping.js index 1fc80276..721ebb14 100644 --- a/commands/General/ping.js +++ b/commands/General/ping.js @@ -11,7 +11,10 @@ class Ping extends BaseCommand { command: new SlashCommandBuilder() .setName("ping") .setDescription(client.translate("general/ping:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/ping:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/ping:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/ping:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/General/remindme.js b/commands/General/remindme.js index 6f4af1e3..bac08144 100644 --- a/commands/General/remindme.js +++ b/commands/General/remindme.js @@ -13,15 +13,24 @@ class Remindme extends BaseCommand { command: new SlashCommandBuilder() .setName("remindme") .setDescription(client.translate("general/remindme:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/remindme:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/remindme:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/remindme:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("time") .setDescription(client.translate("general/remindme:TIME")) - .setDescriptionLocalizations({ "uk": client.translate("general/remindme:TIME", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/remindme:TIME", null, "uk-UA"), + "ru": client.translate("general/remindme:TIME", null, "ru-RU"), + }) .setRequired(true)) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/report.js b/commands/General/report.js index ae2bdcec..04be8323 100644 --- a/commands/General/report.js +++ b/commands/General/report.js @@ -11,15 +11,24 @@ class Report extends BaseCommand { command: new SlashCommandBuilder() .setName("report") .setDescription(client.translate("general/report:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/report:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/report:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/report:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/serverinfo.js b/commands/General/serverinfo.js index e0b7433b..23680a06 100644 --- a/commands/General/serverinfo.js +++ b/commands/General/serverinfo.js @@ -11,7 +11,10 @@ class Serverinfo extends BaseCommand { command: new SlashCommandBuilder() .setName("serverinfo") .setDescription(client.translate("general/serverinfo:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/serverinfo:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/serverinfo:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/serverinfo:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/General/shorturl.js b/commands/General/shorturl.js index ee92899b..170e6d07 100644 --- a/commands/General/shorturl.js +++ b/commands/General/shorturl.js @@ -12,11 +12,17 @@ class Shorturl extends BaseCommand { command: new SlashCommandBuilder() .setName("shorturl") .setDescription(client.translate("general/shorturl:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/shorturl:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/shorturl:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/shorturl:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("url") - .setDescription(client.translate("general/shorturl:URL")) - .setDescriptionLocalizations({ "uk": client.translate("general/shorturl:URL", null, "uk-UA") }) + .setDescription(client.translate("common:URL")) + .setDescriptionLocalizations({ + "uk": client.translate("common:URL", null, "uk-UA"), + "ru": client.translate("common:URL", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/stats.js b/commands/General/stats.js index caccb3ac..b5840859 100644 --- a/commands/General/stats.js +++ b/commands/General/stats.js @@ -11,6 +11,10 @@ class Stats extends BaseCommand { command: new SlashCommandBuilder() .setName("stats") .setDescription(client.translate("general/stats:DESCRIPTION")) + .setDescriptionLocalizations({ + "uk": client.translate("general/stats:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/stats:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/General/suggest.js b/commands/General/suggest.js index c650156f..7a125e25 100644 --- a/commands/General/suggest.js +++ b/commands/General/suggest.js @@ -11,11 +11,17 @@ class Suggest extends BaseCommand { command: new SlashCommandBuilder() .setName("suggest") .setDescription(client.translate("general/suggest:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/suggest:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/suggest:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/suggest:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/General/userinfo.js b/commands/General/userinfo.js index fb714005..74143807 100644 --- a/commands/General/userinfo.js +++ b/commands/General/userinfo.js @@ -11,11 +11,17 @@ class Userinfo extends BaseCommand { command: new SlashCommandBuilder() .setName("userinfo") .setDescription(client.translate("general/userinfo:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/userinfo:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/userinfo:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/userinfo:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/General/whois.js b/commands/General/whois.js index 8ef8b808..46b97b03 100644 --- a/commands/General/whois.js +++ b/commands/General/whois.js @@ -12,11 +12,17 @@ class Whois extends BaseCommand { command: new SlashCommandBuilder() .setName("whois") .setDescription(client.translate("general/whois:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("general/whois:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("general/whois:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("general/whois:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("ip") .setDescription(client.translate("common:IP")) - .setDescriptionLocalizations({ "uk": client.translate("common:IP", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:IP", null, "uk-UA"), + "ru": client.translate("common:IP", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -39,9 +45,11 @@ class Whois extends BaseCommand { async execute(client, interaction) { await interaction.deferReply(); - const ip = interaction.options.getString("ip"); - const whois = await fetch(`http://ip-api.com/json/${ip}?fields=status,message,continent,continentCode,country,countryCode,region,regionName,city,zip,timezone,currency,isp,org,as,mobile,proxy,hosting,query`).then(response => response.json()); + const ip = interaction.options.getString("ip"), + whois = await fetch(`http://ip-api.com/json/${ip}?fields=status,message,continent,continentCode,country,countryCode,region,regionName,city,zip,timezone,currency,isp,org,as,mobile,proxy,hosting,query`).then(response => response.json()); + if (whois.status === "fail") return interaction.editReply({ content: interaction.translate("general/whois:ERROR", { ip }) }); + const embed = new EmbedBuilder() .setTitle(interaction.translate("general/whois:INFO_ABOUT", { ip, @@ -64,8 +72,8 @@ class Whois extends BaseCommand { .setTimestamp(); if (whois.proxy) embed.addFields({ name: interaction.translate("general/whois:INFO"), value: interaction.translate("general/whois:PROXY") }); - else if (whois.mobile) embed.addFields({ name: interaction.translate("general/whois:INFO"), value: interaction.translate("general/whois:MOBILE") }); - else if (whois.hosting) embed.addFields({ name: interaction.translate("general/whois:INFO"), value: interaction.translate("general/whois:HOSTING") }); + if (whois.mobile) embed.addFields({ name: interaction.translate("general/whois:INFO"), value: interaction.translate("general/whois:MOBILE") }); + if (whois.hosting) embed.addFields({ name: interaction.translate("general/whois:INFO"), value: interaction.translate("general/whois:HOSTING") }); interaction.editReply({ embeds: [embed], diff --git a/commands/IAT/checkjar.js b/commands/IAT/checkjar.js index c0db407f..226ccbbc 100644 --- a/commands/IAT/checkjar.js +++ b/commands/IAT/checkjar.js @@ -13,7 +13,10 @@ class Checkjar extends BaseCommand { command: new SlashCommandBuilder() .setName("checkjar") .setDescription(client.translate("iat/checkjar:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("iat/checkjar:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("iat/checkjar:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("iat/checkjar:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Moderation/clear.js b/commands/Moderation/clear.js index ce0353d8..8d90c6f9 100644 --- a/commands/Moderation/clear.js +++ b/commands/Moderation/clear.js @@ -11,19 +11,31 @@ class Clear extends BaseCommand { command: new SlashCommandBuilder() .setName("clear") .setDescription(client.translate("moderation/clear:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/clear:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/clear:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/clear:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addStringOption(option => option.setName("option") .setDescription(client.translate("moderation/clear:OPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/clear:OPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/clear:OPTION", null, "uk-UA"), + "ru": client.translate("moderation/clear:OPTION", null, "ru-RU"), + }) .setRequired(true)) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") })) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + })) .addStringOption(option => option.setName("id") .setDescription(client.translate("common:USER_ID")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER_ID", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:USER_ID", null, "uk-UA"), + "ru": client.translate("common:USER_ID", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: false, diff --git a/commands/Moderation/clearwarns.js b/commands/Moderation/clearwarns.js index c994cbb8..27943877 100644 --- a/commands/Moderation/clearwarns.js +++ b/commands/Moderation/clearwarns.js @@ -11,12 +11,18 @@ class Clearwarns extends BaseCommand { command: new SlashCommandBuilder() .setName("clearwarns") .setDescription(client.translate("moderation/clearwarns:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/clearwarns:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/clearwarns:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/clearwarns:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Moderation/giveaway.js b/commands/Moderation/giveaway.js index d8041e88..27e90f85 100644 --- a/commands/Moderation/giveaway.js +++ b/commands/Moderation/giveaway.js @@ -12,51 +12,87 @@ class Giveaway extends BaseCommand { command: new SlashCommandBuilder() .setName("giveaway") .setDescription(client.translate("moderation/giveaway:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addSubcommand(subcommand => subcommand.setName("create") .setDescription(client.translate("moderation/giveaway:CREATE")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:CREATE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:CREATE", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:CREATE", null, "ru-RU"), + }) .addStringOption(option => option.setName("duration") .setDescription(client.translate("common:DURATION")) - .setDescriptionLocalizations({ "uk": client.translate("common:DURATION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:DURATION", null, "uk-UA"), + "ru": client.translate("common:DURATION", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("winners_count") .setDescription(client.translate("moderation/giveaway:WINNERS_COUNT")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:WINNERS_COUNT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:WINNERS_COUNT", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:WINNERS_COUNT", null, "ru-RU"), + }) .setRequired(true)) .addStringOption(option => option.setName("prize") .setDescription(client.translate("moderation/giveaway:PRIZE")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:PRIZE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:PRIZE", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:PRIZE", null, "ru-RU"), + }) .setRequired(true)) .addBooleanOption(option => option.setName("isdrop") .setDescription(client.translate("moderation/giveaway:ISDROP")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:ISDROP", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:ISDROP", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:ISDROP", null, "ru-RU"), + }) .setRequired(true)), ) .addSubcommand(subcommand => subcommand.setName("reroll") .setDescription(client.translate("moderation/giveaway:REROLL")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:REROLL", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:REROLL", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:REROLL", null, "ru-RU"), + }) .addStringOption(option => option.setName("giveaway_id") .setDescription(client.translate("moderation/giveaway:GIVEAWAY_ID")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "ru-RU"), + }) .setRequired(true)), ) .addSubcommand(subcommand => subcommand.setName("end") .setDescription(client.translate("moderation/giveaway:END")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:END", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:END", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:END", null, "ru-RU"), + }) .addStringOption(option => option.setName("giveaway_id") .setDescription(client.translate("moderation/giveaway:GIVEAWAY_ID")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "ru-RU"), + }) .setRequired(true)), ) .addSubcommand(subcommand => subcommand.setName("delete") .setDescription(client.translate("moderation/giveaway:DELETE")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:DELETE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:DELETE", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:DELETE", null, "ru-RU"), + }) .addStringOption(option => option.setName("giveaway_id") .setDescription(client.translate("moderation/giveaway:GIVEAWAY_ID")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "uk-UA"), + "ru": client.translate("moderation/giveaway:GIVEAWAY_ID", null, "ru-RU"), + }) .setRequired(true)), ), aliases: [], diff --git a/commands/Moderation/poll.js b/commands/Moderation/poll.js index 27a3d870..e1662c14 100644 --- a/commands/Moderation/poll.js +++ b/commands/Moderation/poll.js @@ -11,12 +11,18 @@ class Poll extends BaseCommand { command: new SlashCommandBuilder() .setName("poll") .setDescription(client.translate("moderation/poll:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/poll:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/poll:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/poll:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addStringOption(option => option.setName("question") .setDescription(client.translate("moderation/poll:QUESTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/poll:QUESTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/poll:QUESTION", null, "uk-UA"), + "ru": client.translate("moderation/poll:QUESTION", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Moderation/unban.js b/commands/Moderation/unban.js index 113ac142..315fa04f 100644 --- a/commands/Moderation/unban.js +++ b/commands/Moderation/unban.js @@ -11,12 +11,18 @@ class Unban extends BaseCommand { command: new SlashCommandBuilder() .setName("unban") .setDescription(client.translate("moderation/unban:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/unban:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/unban:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/unban:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addStringOption(option => option.setName("user_id") .setDescription(client.translate("common:USER_ID")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER_ID", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER_ID", null, "uk-UA"), + "ru": client.translate("common:USER_ID", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Moderation/warns.js b/commands/Moderation/warns.js index 20bbce1e..fa6ae2ab 100644 --- a/commands/Moderation/warns.js +++ b/commands/Moderation/warns.js @@ -11,12 +11,18 @@ class Warns extends BaseCommand { command: new SlashCommandBuilder() .setName("warns") .setDescription(client.translate("moderation/warns:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("moderation/warns:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("moderation/warns:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("moderation/warns:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers && PermissionFlagsBits.ManageMessages) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Music/back.js b/commands/Music/back.js index 93dac15d..fc34bc8d 100644 --- a/commands/Music/back.js +++ b/commands/Music/back.js @@ -11,7 +11,10 @@ class Back extends BaseCommand { command: new SlashCommandBuilder() .setName("back") .setDescription(client.translate("music/back:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/back:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/back:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/back:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/clips.js b/commands/Music/clips.js index dfe8f380..538f8f18 100644 --- a/commands/Music/clips.js +++ b/commands/Music/clips.js @@ -13,11 +13,17 @@ class Clips extends BaseCommand { command: new SlashCommandBuilder() .setName("clips") .setDescription(client.translate("music/clips:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/clips:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/clips:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/clips:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("query") .setDescription(client.translate("music/clips:QUERY")) - .setDescriptionLocalizations({ "uk": client.translate("music/clips:QUERY", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/clips:QUERY", null, "uk-UA"), + "ru": client.translate("music/clips:QUERY", null, "ru-RU"), + }) .setRequired(true) .setAutocomplete(true)), aliases: [], diff --git a/commands/Music/loop.js b/commands/Music/loop.js index b44ce370..bd1e2cf1 100644 --- a/commands/Music/loop.js +++ b/commands/Music/loop.js @@ -12,10 +12,17 @@ class Loop extends BaseCommand { command: new SlashCommandBuilder() .setName("loop") .setDescription(client.translate("music/loop:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/loop:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/loop:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/loop:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("option") .setDescription(client.translate("music/loop:OPTION")) + .setDescriptionLocalizations({ + "uk": client.translate("music/loop:OPTION", null, "uk-UA"), + "ru": client.translate("music/loop:OPTION", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: client.translate("music/loop:AUTOPLAY"), value: "3" }, diff --git a/commands/Music/nowplaying.js b/commands/Music/nowplaying.js index fe6d7016..26b9b02e 100644 --- a/commands/Music/nowplaying.js +++ b/commands/Music/nowplaying.js @@ -12,7 +12,10 @@ class Nowplaying extends BaseCommand { command: new SlashCommandBuilder() .setName("nowplaying") .setDescription(client.translate("music/nowplaying:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/nowplaying:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/nowplaying:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/nowplaying:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/play.js b/commands/Music/play.js index 7f6ecc1d..118970ce 100644 --- a/commands/Music/play.js +++ b/commands/Music/play.js @@ -11,11 +11,17 @@ class Play extends BaseCommand { command: new SlashCommandBuilder() .setName("play") .setDescription(client.translate("music/play:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/play:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/play:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/play:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("query") .setDescription(client.translate("music/play:QUERY")) - .setDescriptionLocalizations({ "uk": client.translate("music/play:QUERY", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/play:QUERY", null, "uk-UA"), + "ru": client.translate("music/play:QUERY", null, "ru-RU"), + }) .setRequired(true) .setAutocomplete(true)), aliases: [], diff --git a/commands/Music/queue.js b/commands/Music/queue.js index 60ed331d..4f2bc064 100644 --- a/commands/Music/queue.js +++ b/commands/Music/queue.js @@ -12,7 +12,10 @@ class Queue extends BaseCommand { command: new SlashCommandBuilder() .setName("queue") .setDescription(client.translate("music/queue:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/queue:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/queue:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/queue:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/seek.js b/commands/Music/seek.js index 18b79e86..973da8c4 100644 --- a/commands/Music/seek.js +++ b/commands/Music/seek.js @@ -11,10 +11,16 @@ class Seek extends BaseCommand { command: new SlashCommandBuilder() .setName("seek") .setDescription(client.translate("music/seek:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/seek:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/seek:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/seek:DESCRIPTION", null, "ru-RU"), + }) .addIntegerOption(option => option.setName("time") .setDescription(client.translate("music/seek:TIME")) - .setDescriptionLocalizations({ "uk": client.translate("music/seek:TIME", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/seek:TIME", null, "uk-UA"), + "ru": client.translate("music/seek:TIME", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Music/shuffle.js b/commands/Music/shuffle.js index 4143ba37..41648d12 100644 --- a/commands/Music/shuffle.js +++ b/commands/Music/shuffle.js @@ -11,7 +11,10 @@ class Shuffle extends BaseCommand { command: new SlashCommandBuilder() .setName("shuffle") .setDescription(client.translate("music/shuffle:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/shuffle:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/shuffle:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/shuffle:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/skip.js b/commands/Music/skip.js index 474ad6c0..31ad93c9 100644 --- a/commands/Music/skip.js +++ b/commands/Music/skip.js @@ -11,7 +11,10 @@ class Skip extends BaseCommand { command: new SlashCommandBuilder() .setName("skip") .setDescription(client.translate("music/skip:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/skip:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/skip:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/skip:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/skipto.js b/commands/Music/skipto.js index fa5769d4..cac7df3e 100644 --- a/commands/Music/skipto.js +++ b/commands/Music/skipto.js @@ -11,11 +11,17 @@ class Skipto extends BaseCommand { command: new SlashCommandBuilder() .setName("skipto") .setDescription(client.translate("music/skipto:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/skipto:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/skipto:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/skipto:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addIntegerOption(option => option.setName("position") .setDescription(client.translate("music/skipto:POSITION")) - .setDescriptionLocalizations({ "uk": client.translate("music/skipto:POSITION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/skipto:POSITION", null, "uk-UA"), + "ru": client.translate("music/skipto:POSITION", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, @@ -49,7 +55,7 @@ class Skipto extends BaseCommand { queue.node.skipTo(queue.tracks.at(position - 1)); interaction.success("music/skipto:SUCCESS", { - position: position, + position, }); } else return interaction.error("music/skipto:ERROR", { position: position }); } diff --git a/commands/Music/stop.js b/commands/Music/stop.js index 3f610b4e..58997626 100644 --- a/commands/Music/stop.js +++ b/commands/Music/stop.js @@ -11,7 +11,10 @@ class Stop extends BaseCommand { command: new SlashCommandBuilder() .setName("stop") .setDescription(client.translate("music/stop:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/stop:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/stop:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/stop:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false), aliases: [], dirname: __dirname, diff --git a/commands/Music/volume.js b/commands/Music/volume.js index 8e9d1c7b..33ccbc93 100644 --- a/commands/Music/volume.js +++ b/commands/Music/volume.js @@ -11,11 +11,17 @@ class Volume extends BaseCommand { command: new SlashCommandBuilder() .setName("volume") .setDescription(client.translate("music/volume:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("music/volume:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("music/volume:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("music/volume:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addIntegerOption(option => option.setName("int") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true) .setAutocomplete(true)), aliases: [], diff --git a/commands/NSFW/nsfw.js b/commands/NSFW/nsfw.js index a0a20106..c8e3aa68 100644 --- a/commands/NSFW/nsfw.js +++ b/commands/NSFW/nsfw.js @@ -12,7 +12,10 @@ class NSFW extends BaseCommand { command: new SlashCommandBuilder() .setName("nsfw") .setDescription(client.translate("nsfw/nsfw:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("nsfw/nsfw:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("nsfw/nsfw:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("nsfw/nsfw:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/commands/Owner/announcement.js b/commands/Owner/announcement.js index 068367a4..b1edd79c 100644 --- a/commands/Owner/announcement.js +++ b/commands/Owner/announcement.js @@ -11,19 +11,31 @@ class Announcement extends BaseCommand { command: new SlashCommandBuilder() .setName("announcement") .setDescription(client.translate("owner/announcement:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/announcement:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/announcement:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/announcement:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)) .addBooleanOption(option => option.setName("tag") .setDescription(client.translate("owner/announcement:TAG")) - .setDescriptionLocalizations({ "uk": client.translate("owner/announcement:TAG", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/announcement:TAG", null, "uk-UA"), + "ru": client.translate("owner/announcement:TAG", null, "ru-RU"), + }) .setRequired(true)) .addBooleanOption(option => option.setName("important") .setDescription(client.translate("owner/announcement:IMPORTANT")) - .setDescriptionLocalizations({ "uk": client.translate("owner/announcement:IMPORTANT", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("owner/announcement:IMPORTANT", null, "uk-UA"), + "ru": client.translate("owner/announcement:IMPORTANT", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: true, diff --git a/commands/Owner/debug.js b/commands/Owner/debug.js index bf2d6212..730e517a 100644 --- a/commands/Owner/debug.js +++ b/commands/Owner/debug.js @@ -11,14 +11,23 @@ class Debug extends BaseCommand { command: new SlashCommandBuilder() .setName("debug") .setDescription(client.translate("owner/debug:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/debug:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addSubcommand(subcommand => subcommand.setName("set") .setDescription(client.translate("owner/debug:SET")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:SET", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:SET", null, "uk-UA"), + "ru": client.translate("owner/debug:SET", null, "ru-RU"), + }) .addStringOption(option => option.setName("type") .setDescription(client.translate("owner/debug:TYPE")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:TYPE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:TYPE", null, "uk-UA"), + "ru": client.translate("owner/debug:TYPE", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: client.translate("common:LEVEL"), value: "level" }, @@ -29,19 +38,31 @@ class Debug extends BaseCommand { )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("int") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), ) .addSubcommand(subcommand => subcommand.setName("add") .setDescription(client.translate("owner/debug:ADD")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:ADD", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:ADD", null, "uk-UA"), + "ru": client.translate("owner/debug:ADD", null, "ru-RU"), + }) .addStringOption(option => option.setName("type") .setDescription(client.translate("owner/debug:TYPE")) - .setDescriptionLocalizations({ "uk": client.translate("owner/debug:TYPE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/debug:TYPE", null, "uk-UA"), + "ru": client.translate("owner/debug:TYPE", null, "ru-RU"), + }) .setRequired(true) .setChoices( { name: client.translate("common:LEVEL"), value: "level" }, @@ -52,11 +73,17 @@ class Debug extends BaseCommand { )) .addUserOption(option => option.setName("user") .setDescription(client.translate("common:USER")) - .setDescriptionLocalizations({ "uk": client.translate("common:USER", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:USER", null, "uk-UA"), + "ru": client.translate("common:USER", null, "ru-RU"), + }) .setRequired(true)) .addIntegerOption(option => option.setName("int") .setDescription(client.translate("common:INT")) - .setDescriptionLocalizations({ "uk": client.translate("common:INT", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:INT", null, "uk-UA"), + "ru": client.translate("common:INT", null, "ru-RU"), + }) .setRequired(true)), ), aliases: [], diff --git a/commands/Owner/eval.js b/commands/Owner/eval.js index 1ba3885a..faaba0c9 100644 --- a/commands/Owner/eval.js +++ b/commands/Owner/eval.js @@ -11,11 +11,17 @@ class Eval extends BaseCommand { command: new SlashCommandBuilder() .setName("eval") .setDescription(client.translate("owner/eval:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/eval:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/eval:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/eval:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("code") .setDescription(client.translate("owner/eval:CODE")) - .setDescriptionLocalizations({ "uk": client.translate("owner/eval:CODE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/eval:CODE", null, "uk-UA"), + "ru": client.translate("owner/eval:CODE", null, "ru-RU"), + }) .setRequired(true)), aliases: [], dirname: __dirname, diff --git a/commands/Owner/reload.js b/commands/Owner/reload.js index e803e711..17aaa996 100644 --- a/commands/Owner/reload.js +++ b/commands/Owner/reload.js @@ -13,11 +13,17 @@ class Reload extends BaseCommand { command: new SlashCommandBuilder() .setName("reload") .setDescription(client.translate("owner/reload:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/reload:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/reload:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/reload:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true) .addStringOption(option => option.setName("command") .setDescription(client.translate("common:COMMAND")) - .setDescriptionLocalizations({ "uk": client.translate("common:COMMAND", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:COMMAND", null, "uk-UA"), + "ru": client.translate("common:COMMAND", null, "ru-RU"), + }) .setRequired(true) .setAutocomplete(true)), aliases: [], diff --git a/commands/Owner/say.js b/commands/Owner/say.js index 589bc22e..efa80a90 100644 --- a/commands/Owner/say.js +++ b/commands/Owner/say.js @@ -11,15 +11,24 @@ class Say extends BaseCommand { command: new SlashCommandBuilder() .setName("say") .setDescription(client.translate("owner/say:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/say:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/say:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/say:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(false) .addStringOption(option => option.setName("message") .setDescription(client.translate("common:MESSAGE")) - .setDescriptionLocalizations({ "uk": client.translate("common:MESSAGE", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("common:MESSAGE", null, "uk-UA"), + "ru": client.translate("common:MESSAGE", null, "ru-RU"), + }) .setRequired(true)) .addChannelOption(option => option.setName("channel") .setDescription(client.translate("common:CHANNEL")) - .setDescriptionLocalizations({ "uk": client.translate("common:CHANNEL", null, "uk-UA") })), + .setDescriptionLocalizations({ + "uk": client.translate("common:CHANNEL", null, "uk-UA"), + "ru": client.translate("common:CHANNEL", null, "ru-RU"), + })), aliases: [], dirname: __dirname, ownerOnly: true, diff --git a/commands/Owner/servers.js b/commands/Owner/servers.js index f4be6742..2850bd07 100644 --- a/commands/Owner/servers.js +++ b/commands/Owner/servers.js @@ -11,7 +11,10 @@ class Servers extends BaseCommand { command: new SlashCommandBuilder() .setName("servers") .setDescription(client.translate("owner/servers:DESCRIPTION")) - .setDescriptionLocalizations({ "uk": client.translate("owner/servers:DESCRIPTION", null, "uk-UA") }) + .setDescriptionLocalizations({ + "uk": client.translate("owner/servers:DESCRIPTION", null, "uk-UA"), + "ru": client.translate("owner/servers:DESCRIPTION", null, "ru-RU"), + }) .setDMPermission(true), aliases: [], dirname: __dirname, diff --git a/dashboard/public/docs/updates.md b/dashboard/public/docs/updates.md index e8c74f16..05df17f0 100644 --- a/dashboard/public/docs/updates.md +++ b/dashboard/public/docs/updates.md @@ -1,3 +1,13 @@ +### JaBa v4.2.5 +* Изменено + * Изменения в локализации, основным языком теперь является английский.\ + Подсказки по командам зависят от языка вашего клиента, ответ зависит от языка сервера. + * Отключена команда *memes*. + * Отключена команда *staff*. + +* Удалено + * Антиспам - Дискорд и сам справляется. + ### JaBa v4.2.4 * Добавлено * Бот цитирует сообщение если отправлена ссылка на него. diff --git a/languages/en-US/common.json b/languages/en-US/common.json index 821db8db..84955c71 100644 --- a/languages/en-US/common.json +++ b/languages/en-US/common.json @@ -25,6 +25,7 @@ "SERVER_ID": "Server ID", "MESSAGE_ID": "Message ID", "USER_ID": "User ID", + "URL": "URL", "ID": "ID", "INT": "Integer", "IP": "IP Address", @@ -45,7 +46,7 @@ "PAGE": "Page", "PROFILE": "Profile", "REASON": "Reason", - "REP": "Reputation Points", + "REP": "Reputation", "ROBOT": "Bot", "ROLE": "Role", "ROLES": "Roles", diff --git a/languages/en-US/economy/birthdate.json b/languages/en-US/economy/birthdate.json index 198eee99..97d4ff18 100644 --- a/languages/en-US/economy/birthdate.json +++ b/languages/en-US/economy/birthdate.json @@ -10,5 +10,18 @@ "DATE_TOO_HIGH": "Hmm... You haven't been born yet", "HAPPY_BIRTHDAY": "Happy Birthday", "HAPPY_BIRTHDAY_MESSAGE": "Happy birthday to {{name}} (<@{{user}}>)! Today, they have turned {{age}}!", - "SUCCESS": "Your date of birth has been set to **{{date}}**" + "SUCCESS": "Your date of birth has been set to **{{date}}**", + + "JANUARY": "January", + "FEBRUARY": "February", + "MARCH": "March", + "APRIL": "April", + "MAY": "May", + "JUNE": "June", + "JULY": "July", + "AUGUST": "August", + "SEPTEMBER": "September", + "OCTOBER": "October", + "NOVEMBER": "November", + "DECEMBER": "December" } \ No newline at end of file diff --git a/languages/en-US/economy/leaderboard.json b/languages/en-US/economy/leaderboard.json index 7f87cc8c..e02c22b6 100644 --- a/languages/en-US/economy/leaderboard.json +++ b/languages/en-US/economy/leaderboard.json @@ -2,9 +2,6 @@ "DESCRIPTION": "Shows the leaderboard for credits, level, or reputation points", "USAGE": "[type]", "EXAMPLES": "leaderboard type:Level", - "LEVEL": "Level", - "MONEY": "Credits", - "REP": "Reputation", "MOBILE": ":confused: I noticed that you're online from a mobile device... The leaderboard may not display correctly on small screens. Please try again later from a different device.", "TABLE": "{{name}} Leaderboard" } \ No newline at end of file diff --git a/languages/en-US/general/avatar.json b/languages/en-US/general/avatar.json index 1ba23bce..b5e2e27c 100644 --- a/languages/en-US/general/avatar.json +++ b/languages/en-US/general/avatar.json @@ -1,5 +1,6 @@ { "DESCRIPTION": "Gets user's avatar", "USAGE": "(@user)", - "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226" + "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226", + "SERVER": "Server avatar?" } \ No newline at end of file diff --git a/languages/en-US/general/shorturl.json b/languages/en-US/general/shorturl.json index cfa0aab4..542b62d6 100644 --- a/languages/en-US/general/shorturl.json +++ b/languages/en-US/general/shorturl.json @@ -1,6 +1,5 @@ { "DESCRIPTION": "Shortens a URL", "USAGE": "[url]", - "EXAMPLES": "shorturl url:https://google.com", - "URL": "URL" + "EXAMPLES": "shorturl url:https://google.com" } \ No newline at end of file diff --git a/languages/language-meta.json b/languages/language-meta.json index a10799bb..f0b8edd5 100644 --- a/languages/language-meta.json +++ b/languages/language-meta.json @@ -1,10 +1,17 @@ [ + { + "name": "en-US", + "nativeName": "English", + "moment": "en", + "defaultMomentFormat": "MMMM Do YYYY", + "default": true + }, { "name": "ru-RU", "nativeName": "Русский", "moment": "ru", "defaultMomentFormat": "Do MMMM YYYY", - "default": true + "default": false }, { "name": "uk-UA", @@ -12,12 +19,5 @@ "moment": "uk", "defaultMomentFormat": "Do MMMM YYYY", "default": false - }, - { - "name": "en-US", - "nativeName": "English", - "moment": "en", - "defaultMomentFormat": "MMMM Do YYYY", - "default": false } ] \ No newline at end of file diff --git a/languages/ru-RU/common.json b/languages/ru-RU/common.json index ab1c4877..cf3c39cc 100644 --- a/languages/ru-RU/common.json +++ b/languages/ru-RU/common.json @@ -25,6 +25,7 @@ "SERVER_ID": "ID сервера", "MESSAGE_ID": "ID сообщения", "USER_ID": "ID пользователя", + "URL": "URL", "ID": "ID", "INT": "Целое число", "IP": "IP адрес", @@ -45,7 +46,7 @@ "PAGE": "Страница", "PROFILE": "Профиль", "REASON": "Причина", - "REP": "Очки репутации", + "REP": "Репутация", "ROBOT": "Бот", "ROLE": "Роль", "ROLES": "Роли", diff --git a/languages/ru-RU/economy/birthdate.json b/languages/ru-RU/economy/birthdate.json index 7c26e10d..d2f83c45 100644 --- a/languages/ru-RU/economy/birthdate.json +++ b/languages/ru-RU/economy/birthdate.json @@ -10,5 +10,18 @@ "DATE_TOO_HIGH": "Хммм... Вы ещё не родились", "HAPPY_BIRTHDAY": "День рождения", "HAPPY_BIRTHDAY_MESSAGE": "Поздравляем {{name}} (<@{{user}}>) с днём рождения, сегодня ему(ей) исполнилось {{age}}!", - "SUCCESS": "Ваша дата рождения установлена на **{{date}}**" + "SUCCESS": "Ваша дата рождения установлена на **{{date}}**", + + "JANUARY": "Январь", + "FEBRUARY": "Февраль", + "MARCH": "Март", + "APRIL": "Апрель", + "MAY": "Май", + "JUNE": "Июнь", + "JULY": "Июль", + "AUGUST": "Август", + "SEPTEMBER": "Сентябрь", + "OCTOBER": "Октябрь", + "NOVEMBER": "Ноябрь", + "DECEMBER": "Декабрь" } \ No newline at end of file diff --git a/languages/ru-RU/economy/leaderboard.json b/languages/ru-RU/economy/leaderboard.json index a607e2bf..16f4d970 100644 --- a/languages/ru-RU/economy/leaderboard.json +++ b/languages/ru-RU/economy/leaderboard.json @@ -2,9 +2,6 @@ "DESCRIPTION": "Показать таблицу лидеров по кредитам, уровню или очкам репутации", "USAGE": "[type]", "EXAMPLES": "leaderboard type:Уровень", - "LEVEL": "Уровень", - "MONEY": "Кредиты", - "REP": "Репутация", "MOBILE": ":confused: Я заметил, что вы онлайн с телефона... Таблица лидеров может отображаться некорректно на маленьких экранах. Попробуйте позже с другого устройства", "TABLE": "Таблица лидеров {{name}}" } \ No newline at end of file diff --git a/languages/ru-RU/general/avatar.json b/languages/ru-RU/general/avatar.json index a245536d..9dd527ef 100644 --- a/languages/ru-RU/general/avatar.json +++ b/languages/ru-RU/general/avatar.json @@ -1,5 +1,6 @@ { "DESCRIPTION": "Возвращает аватар пользователя", "USAGE": "(@user)", - "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226" + "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226", + "SERVER": "Аватар сервера?" } \ No newline at end of file diff --git a/languages/uk-UA/common.json b/languages/uk-UA/common.json index b40a57bf..7f719a92 100644 --- a/languages/uk-UA/common.json +++ b/languages/uk-UA/common.json @@ -25,6 +25,7 @@ "SERVER_ID": "ID сервера", "MESSAGE_ID": "ID повідомлення", "USER_ID": "ID користувача", + "URL": "URL", "INT": "Ціле число", "IP": "IP-адреса", "JOINED": "Приєднався", @@ -44,7 +45,7 @@ "PAGE": "Сторінка", "PROFILE": "Профіль", "REASON": "Причина", - "REP": "Поінти репутації", + "REP": "Репутація", "ROBOT": "Бот", "ROLE": "Роль", "ROLES": "Ролі", diff --git a/languages/uk-UA/economy/birthdate.json b/languages/uk-UA/economy/birthdate.json index d9c40ca4..b5f1a567 100644 --- a/languages/uk-UA/economy/birthdate.json +++ b/languages/uk-UA/economy/birthdate.json @@ -10,5 +10,18 @@ "DATE_TOO_HIGH": "Хммм... Ви ще не народилися", "HAPPY_BIRTHDAY": "День народження", "HAPPY_BIRTHDAY_MESSAGE": "Вітаємо {{name}} (<@{{user}}>) з днем народження, сьогодні йому виповнилося {{age}}", - "SUCCESS": "Вашу дату народження встановлено на **{{date}}**" + "SUCCESS": "Вашу дату народження встановлено на **{{date}}**", + + "JANUARY": "Січень", + "FEBRUARY": "Лютий", + "MARCH": "Березень", + "APRIL": "Квітень", + "MAY": "Травень", + "JUNE": "Червень", + "JULY": "Липень", + "AUGUST": "Серпень", + "SEPTEMBER": "Вересень", + "OCTOBER": "Жовтень", + "NOVEMBER": "Листопад", + "DECEMBER": "Грудень" } \ No newline at end of file diff --git a/languages/uk-UA/economy/leaderboard.json b/languages/uk-UA/economy/leaderboard.json index 266c0ae2..55340175 100644 --- a/languages/uk-UA/economy/leaderboard.json +++ b/languages/uk-UA/economy/leaderboard.json @@ -2,9 +2,6 @@ "DESCRIPTION": "Показати таблицю лідерів за кредитами, рівнем або поінтами репутації", "USAGE": "[type]", "EXAMPLES": "leaderboard type:Рівень", - "LEVEL": "Рівень", - "MONEY": "Кредити", - "REP": "Репутація", "MOBILE": ":confused: Я помітив, що ви онлайн з телефону... Таблиця лідерів може відображатися некоректно на маленьких екранах. Спробуйте пізніше з іншого пристрою", "TABLE": "Таблиця лідерів {{name}}" } \ No newline at end of file diff --git a/languages/uk-UA/general/avatar.json b/languages/uk-UA/general/avatar.json index 77681632..dc24bade 100644 --- a/languages/uk-UA/general/avatar.json +++ b/languages/uk-UA/general/avatar.json @@ -1,5 +1,6 @@ { "DESCRIPTION": "Повертає аватар користувача", "USAGE": "(@user)", - "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226" + "EXAMPLES": "avatar\navatar user:@Jonny_Bro#4226", + "SERVER": "Аватар сервера?" } \ No newline at end of file diff --git a/package.json b/package.json index 5b3c3d01..75976aa9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jaba", - "version": "4.2.3", + "version": "4.2.5", "description": "My Discord Bot", "main": "index.js", "private": true,