From a3f78a9917abf55d756dd4333e04bff5668afa67 Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Tue, 15 Feb 2022 01:52:36 +0500 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/Moderation/mute.js | 2 +- commands/Moderation/sanctions.js | 12 ++++++------ .../en-US/moderation/{sanctions.json => warns.json} | 0 languages/ru-RU/moderation/mute.json | 1 + .../ru-RU/moderation/{sanctions.json => warns.json} | 0 languages/uk-UA/moderation/mute.json | 1 + .../uk-UA/moderation/{sanctions.json => warns.json} | 0 7 files changed, 9 insertions(+), 7 deletions(-) rename languages/en-US/moderation/{sanctions.json => warns.json} (100%) rename languages/ru-RU/moderation/{sanctions.json => warns.json} (100%) rename languages/uk-UA/moderation/{sanctions.json => warns.json} (100%) diff --git a/commands/Moderation/mute.js b/commands/Moderation/mute.js index 04c26702..0a13a2e9 100644 --- a/commands/Moderation/mute.js +++ b/commands/Moderation/mute.js @@ -21,7 +21,7 @@ class Mute extends Command { async run(message, args, data) { const member = await this.client.resolveMember(args[0], message.guild); if (!member) return message.error("moderation/mute:MISSING_MEMBER"); - if (member.id === message.author.id) return message.error("moderation/ban:YOURSELF"); + if (member.id === message.author.id) return message.error("moderation/mute:YOURSELF"); const memberPosition = member.roles.highest.position; const moderationPosition = message.member.roles.highest.position; diff --git a/commands/Moderation/sanctions.js b/commands/Moderation/sanctions.js index 3e768fc4..794267f3 100644 --- a/commands/Moderation/sanctions.js +++ b/commands/Moderation/sanctions.js @@ -1,14 +1,14 @@ const Command = require("../../base/Command"), Discord = require("discord.js"); -class Sanctions extends Command { +class Warns extends Command { constructor(client) { super(client, { - name: "sanctions", + name: "warns", dirname: __dirname, enabled: true, guildOnly: true, - aliases: ["warns"], + aliases: ["ws"], memberPermissions: ["MANAGE_MESSAGES"], botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], nsfw: false, @@ -19,7 +19,7 @@ class Sanctions extends Command { async run(message, args, data) { const user = await this.client.resolveUser(args[0]); - if (!user) return message.error("moderation/sanctions:MISSING_MEMBER"); + if (!user) return message.error("moderation/warns:MISSING_MEMBER"); const memberData = await this.client.findOrCreateMember({ id: user.id, @@ -41,7 +41,7 @@ class Sanctions extends Command { }); if (memberData.sanctions.length < 1) { - embed.setDescription(message.translate("moderation/sanctions:NO_SANCTION", { + embed.setDescription(message.translate("moderation/warns:NO_SANCTION", { username: user.tag })); return message.reply({ @@ -58,4 +58,4 @@ class Sanctions extends Command { } } -module.exports = Sanctions; \ No newline at end of file +module.exports = Warns; \ No newline at end of file diff --git a/languages/en-US/moderation/sanctions.json b/languages/en-US/moderation/warns.json similarity index 100% rename from languages/en-US/moderation/sanctions.json rename to languages/en-US/moderation/warns.json diff --git a/languages/ru-RU/moderation/mute.json b/languages/ru-RU/moderation/mute.json index 5f8408e2..b0087579 100644 --- a/languages/ru-RU/moderation/mute.json +++ b/languages/ru-RU/moderation/mute.json @@ -3,6 +3,7 @@ "USAGE": "{{prefix}}mute [@пользователь] [время] (причина)", "EXAMPLES": "{{prefix}}mute @Jonny_Bro#4226 24h Спам", "MISSING_MEMBER": "Вы должны упомянуть пользователя!", + "YOURSELF": "Вы не можете замутить себя!", "MUTED_DM": "Привет {{username}},\nвы были замучены на сервере **{{server}}** пользователем **{{moderator}}** на **{{time}}** по причине **{{reason}}**!", "MUTED": "**{{username}}** замучен на **{{time}}** по причине **{{reason}}**!", "CASE": "Мут | Номер #{{count}}" diff --git a/languages/ru-RU/moderation/sanctions.json b/languages/ru-RU/moderation/warns.json similarity index 100% rename from languages/ru-RU/moderation/sanctions.json rename to languages/ru-RU/moderation/warns.json diff --git a/languages/uk-UA/moderation/mute.json b/languages/uk-UA/moderation/mute.json index 5f8408e2..b0087579 100644 --- a/languages/uk-UA/moderation/mute.json +++ b/languages/uk-UA/moderation/mute.json @@ -3,6 +3,7 @@ "USAGE": "{{prefix}}mute [@пользователь] [время] (причина)", "EXAMPLES": "{{prefix}}mute @Jonny_Bro#4226 24h Спам", "MISSING_MEMBER": "Вы должны упомянуть пользователя!", + "YOURSELF": "Вы не можете замутить себя!", "MUTED_DM": "Привет {{username}},\nвы были замучены на сервере **{{server}}** пользователем **{{moderator}}** на **{{time}}** по причине **{{reason}}**!", "MUTED": "**{{username}}** замучен на **{{time}}** по причине **{{reason}}**!", "CASE": "Мут | Номер #{{count}}" diff --git a/languages/uk-UA/moderation/sanctions.json b/languages/uk-UA/moderation/warns.json similarity index 100% rename from languages/uk-UA/moderation/sanctions.json rename to languages/uk-UA/moderation/warns.json