From 62a33e4530e6130fad90afafd1ab8641fc5b6abc Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Sun, 26 Dec 2021 13:57:14 +0500 Subject: [PATCH] fixeeees --- commands/Moderation/kick.js | 2 +- commands/Moderation/warn.js | 2 +- languages/en-US/moderation/ban.json | 2 +- languages/en-US/moderation/kick.json | 1 + languages/en-US/moderation/warn.json | 1 + languages/ru-RU/moderation/kick.json | 1 + languages/ru-RU/moderation/warn.json | 3 ++- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js index 8f5bbb94..b8fb3fbb 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -21,7 +21,7 @@ class Kick extends Command { const member = await this.client.resolveMember(args[0], message.guild); if (!member) return message.error("moderation/kick:MISSING_MEMBER"); - if (member.id === message.author.id) return message.error("moderation/ban:YOURSELF"); + if (member.id === message.author.id) return message.error("moderation/kick:YOURSELF"); const memberData = await this.client.findOrCreateMember({ id: member.id, guildID: message.guild.id }); diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js index 021cb6e1..dbead3b8 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -24,7 +24,7 @@ class Warn extends Command { const memberData = await this.client.findOrCreateMember({ id: member.id, guildID: message.guild.id }); - if (member.id === message.author.id) return message.error("moderation/ban:YOURSELF"); + if (member.id === message.author.id) return message.error("moderation/warn:YOURSELF"); const memberPosition = member.roles.highest.position; const moderationPosition = message.member.roles.highest.position; diff --git a/languages/en-US/moderation/ban.json b/languages/en-US/moderation/ban.json index 13080248..972f9d4f 100644 --- a/languages/en-US/moderation/ban.json +++ b/languages/en-US/moderation/ban.json @@ -3,7 +3,7 @@ "USAGE": "{{prefix}}ban [@user] (reason)", "EXAMPLES": "{{prefix}}ban @Jonny_Bro#4226 Spam", "MISSING_MEMBER": "Please specify a valid member to ban!", - "YOURSELF": "You can't sanction yourself!", + "YOURSELF": "You can't ban yourself!", "SUPERIOR": "You can't sanction or update a sanction for a member who has an higher or equal role hierarchy to yours!", "ALREADY_BANNED": "**{{username}}** is already banned!", "MISSING_PERM": "An error has occurred... Please check that I have the permission to ban this specific member and try again!", diff --git a/languages/en-US/moderation/kick.json b/languages/en-US/moderation/kick.json index a115bb13..c44343f0 100644 --- a/languages/en-US/moderation/kick.json +++ b/languages/en-US/moderation/kick.json @@ -3,6 +3,7 @@ "USAGE": "{{prefix}}kick [@member] (reason)", "EXAMPLES": "{{prefix}}kick @Jonny_Bro#4226 Spam", "MISSING_MEMBER": "Please specify a valid member to kick!", + "YOURSELF": "You can't kick yourself!", "MISSING_PERM": "An error has occurred... Please check that I have the permission to kick this specific member and try again!", "KICKED_DM": "Hello {{username}},\nYou have just been kicked from **{{server}}** by **{{moderator}}** because of **{{reason}}**!", "KICKED": "**{{username}}** has just been kicked from **{{server}}** by **{{moderator}}** because of **{{reason}}**!", diff --git a/languages/en-US/moderation/warn.json b/languages/en-US/moderation/warn.json index 50d3af23..790d85cd 100644 --- a/languages/en-US/moderation/warn.json +++ b/languages/en-US/moderation/warn.json @@ -3,6 +3,7 @@ "USAGE": "{{prefix}}warn [@member] [reason]", "EXAMPLES": "{{prefix}}warn @Jonny_Bro#4226 Dumb", "MISSING_MEMBER": "Please specify the member you want to warn!", + "YOURSELF": "You can't warn yourself!", "MISSING_REASON": "Please enter a reason!", "WARNED_DM": "Hello {{username}},\nYou've just been warned on **{{server}}** by **{{moderator}}** for **{{reason}}**!", "WARNED": "**{{username}}** has been warned in private messages for **{{reason}}**!", diff --git a/languages/ru-RU/moderation/kick.json b/languages/ru-RU/moderation/kick.json index 8f6a069f..171186d7 100644 --- a/languages/ru-RU/moderation/kick.json +++ b/languages/ru-RU/moderation/kick.json @@ -3,6 +3,7 @@ "USAGE": "{{prefix}}kick [@пользователь] (причина)", "EXAMPLES": "{{prefix}}kick @Jonny_Bro#4226 Спам", "MISSING_MEMBER": "Вы должны упомянуть пользователя!", + "YOURSELF": "Вы не можете кикнуть себя!", "MISSING_PERM": "Произошла ошибка... Проверьте, есть ли у вас право кикать пользователей и попробуйте снова!", "KICKED_DM": "Привет {{username}},\nвы были кикнуты с сервера **{{server}}** пользователем **{{moderator}}** по причине **{{reason}}**!", "KICKED": "**{{username}}** был кикнут с сервера **{{server}}** пользователем **{{moderator}}** по причине **{{reason}}**!", diff --git a/languages/ru-RU/moderation/warn.json b/languages/ru-RU/moderation/warn.json index 35ee23a4..bbef0369 100644 --- a/languages/ru-RU/moderation/warn.json +++ b/languages/ru-RU/moderation/warn.json @@ -1,8 +1,9 @@ { "DESCRIPTION": "Выдать предупреждение пользователю в ЛС", "USAGE": "{{prefix}}warn [@пользователь] [причина]", - "EXAMPLES": "{{prefix}}warn @Jonny_Bro#4226 whats 9 + 10", + "EXAMPLES": "{{prefix}}warn @Jonny_Bro#4226 stupid", "MISSING_MEMBER": "Вы должны упомянуть пользователя!", + "YOURSELF": "Вы не можете подать жалобу на себя!", "MISSING_REASON": "Укажите причину!", "WARNED_DM": "Привет {{username}},\nвы получили предупреждение на сервере **{{server}}** от пользователя **{{moderator}}** по причине **{{reason}}**!", "WARNED": "**{{username}}** получил предупреждение в ЛС по причине **{{reason}}**!",