v4.1.17 - https://github.com/JonnyBro/JaBa-logs

.gitignore

@@ -22,3 +22,6 @@
 # Node modules
 node_modules
 yarn.lock
+
+# Backups
+/.backup

commands/Fun/cat.js

@@ -0,0 +1,45 @@
+const { SlashCommandBuilder } = require("discord.js");
+const BaseCommand = require("../../base/BaseCommand"),
+	fetch = require("node-fetch");
+
+class Cat extends BaseCommand {
+	/**
+	 *
+	 * @param {import("../base/JaBa")} client
+	 */
+	constructor(client) {
+		super({
+			command: new SlashCommandBuilder()
+				.setName("cat")
+				.setDescription(client.translate("fun/cat:DESCRIPTION"))
+				.setDMPermission(true),
+			aliases: [],
+			dirname: __dirname,
+			ownerOnly: false
+		});
+	}
+	/**
+	 *
+	 * @param {import("../../base/JaBa")} client
+	 */
+	async onLoad() {
+		//...
+	}
+	/**
+	 *
+	 * @param {import("../../base/JaBa")} client
+	 * @param {import("discord.js").ChatInputCommandInteraction} interaction
+	 * @param {Object} data
+	 */
+	async execute(client, interaction) {
+		await interaction.deferReply();
+
+		const res = await fetch("https://and-here-is-my-code.glitch.me/img/cat").then(response => response.json());
+
+		interaction.editReply({
+			content: res.Link
+		});
+	}
+}
+
+module.exports = Cat;

commands/Fun/dog.js

@@ -0,0 +1,45 @@
+const { SlashCommandBuilder } = require("discord.js");
+const BaseCommand = require("../../base/BaseCommand"),
+	fetch = require("node-fetch");
+
+class Dog extends BaseCommand {
+	/**
+	 *
+	 * @param {import("../base/JaBa")} client
+	 */
+	constructor(client) {
+		super({
+			command: new SlashCommandBuilder()
+				.setName("dog")
+				.setDescription(client.translate("fun/dog:DESCRIPTION"))
+				.setDMPermission(true),
+			aliases: [],
+			dirname: __dirname,
+			ownerOnly: false
+		});
+	}
+	/**
+	 *
+	 * @param {import("../../base/JaBa")} client
+	 */
+	async onLoad() {
+		//...
+	}
+	/**
+	 *
+	 * @param {import("../../base/JaBa")} client
+	 * @param {import("discord.js").ChatInputCommandInteraction} interaction
+	 * @param {Object} data
+	 */
+	async execute(client, interaction) {
+		await interaction.deferReply();
+
+		const res = await fetch("https://and-here-is-my-code.glitch.me/img/dog").then(response => response.json());
+
+		interaction.editReply({
+			content: res.Link
+		});
+	}
+}
+
+module.exports = Dog;

commands/General/help.js

@@ -14,7 +14,7 @@ class Help extends BaseCommand {
 				.setDMPermission(true)
 				.addStringOption(option =>
 					option.setName("command")
-						.setDescription(client.translate("owner/reload:COMMAND"))),
+						.setDescription(client.translate("common:COMMAND"))),
 			aliases: [],
 			dirname: __dirname,
 			ownerOnly: false
@@ -40,13 +40,7 @@ class Help extends BaseCommand {
 		const categories = [];
 		const command = interaction.options.getString("command");
 
-		if (command) {
+		if (command) return interaction.editReply({ embeds: [ generateCommandHelp(interaction, command) ] });
-			const embed = generateCommandHelp(interaction, command);
-
-			return interaction.editReply({
-				embeds: [embed]
-			});
-		}
 
 		commands.forEach(c => {
 			if (!categories.includes(c.category)) {
@@ -80,41 +74,37 @@ class Help extends BaseCommand {
 		const collector = msg.createMessageComponentCollector({ filter, idle: (15 * 1000) });
 
 		collector.on("collect", async i => {
-			if (i.isSelectMenu() && (i.customId === "help_category_select" || i.customId === "help_commands_select")) {
+			if (i.isSelectMenu() && i.customId === "help_category_select") {
 				i.deferUpdate();
 
 				const arg = i?.values[0];
+				const categoryCommands = commands.filter(cmd => cmd.category === arg).map(c => {
+					return {
+						name: `**${c.command.name}**`,
+						value: interaction.translate(`${arg.toLowerCase()}/${c.command.name}:DESCRIPTION`)
+					};
+				});
 
-				if (categories.includes(arg)) {
+				const embed = new EmbedBuilder()
-					const categoryCommands = commands.filter(cmd => cmd.category === arg).map(c => {
+					.setColor(client.config.embed.color)
-						return {
+					.setFooter({
-							label: c.command.name,
+						text: client.config.embed.footer
-							value: c.command.name
+					})
-						};
+					.setAuthor({
-					});
+						name: interaction.translate("general/help:COMMANDS_IN", { category: arg })
+					})
+					.addFields(categoryCommands)
+					.addFields([
+						{
+							name: "\u200B",
+							value: interaction.translate("general/help:INFO")
+						}
+					]);
 
-					const commandsRow = new ActionRowBuilder()
+				return interaction.editReply({
-						.addComponents(
+					content: null,
-							new SelectMenuBuilder()
+					embeds: [embed]
-								.setCustomId("help_commands_select")
+				});
-								.setPlaceholder(client.translate("common:NOTHING_SELECTED"))
-								.addOptions(categoryCommands)
-						);
-
-					return await interaction.editReply({
-						content: interaction.translate("general/help:COMMANDS_IN", {
-							category: arg
-						}),
-						components: [commandsRow]
-					});
-				} else {
-					const embed = generateCommandHelp(interaction, arg);
-					return interaction.editReply({
-						content: null,
-						components: [],
-						embeds: [embed]
-					});
-				}
 			}
 		});
 

commands/Moderation/warn.js

@@ -35,9 +35,9 @@ class Warn extends BaseCommand {
 		const member = interaction.targetMember;
 		const memberPosition = member.roles.highest.position;
 		const moderationPosition = interaction.member.roles.highest.position;
-		if (member.user.bot) return;
+		if (member.user.bot) return interaction.error("misc:BOT_USER", null, { ephemeral: true });
-		if (member.id === interaction.member.id) return interaction.error("moderation/warn:YOURSELF");
+		if (member.id === interaction.member.id) return interaction.error("moderation/warn:YOURSELF", null, { ephemeral: true });
-		if (interaction.guild.ownerId !== interaction.member.id && !(moderationPosition > memberPosition)) return interaction.error("moderation/ban:SUPERIOR");
+		if (interaction.guild.ownerId !== interaction.member.id && !(moderationPosition > memberPosition)) return interaction.error("moderation/ban:SUPERIOR", null, { ephemeral: true });
 
 		const memberData = await client.findOrCreateMember({
 			id: member.id,
@@ -46,9 +46,7 @@ class Warn extends BaseCommand {
 
 		const modal = new ModalBuilder()
 			.setCustomId("warn_modal")
-			.setTitle(interaction.translate("moderation/warn:MODAL_TITLE", {
+			.setTitle(interaction.translate("moderation/warn:MODAL_TITLE", { nickname: member.user.tag }).normalize("NFKD"));
-				nickname: member.user.tag
-			}));
 
 		const reasonInput = new TextInputBuilder()
 			.setCustomId("warn_reason")
@@ -115,7 +113,7 @@ class Warn extends BaseCommand {
 							count: data.guildData.casesCount
 						})
 					})
-						.setColor("#e02316");
+						.setColor(client.config.embed.color);
 					interaction.guild.members.ban(member);
 					interaction.success("moderation/setwarns:AUTO_BAN", {
 						username: member.user.tag,
@@ -140,7 +138,7 @@ class Warn extends BaseCommand {
 							count: data.guildData.casesCount
 						})
 					})
-						.setColor("#e88709");
+						.setColor(client.config.embed.color);
 					member.kick().catch(() => {});
 					interaction.success("moderation/setwarns:AUTO_KICK", {
 						username: member.user.tag,
@@ -163,7 +161,7 @@ class Warn extends BaseCommand {
 				name: interaction.translate("moderation/warn:CASE", {
 					caseNumber: data.guildData.casesCount
 				})
-			}).setColor("#8c14e2");
+			}).setColor(client.config.embed.color);
 
 			submitted.reply({
 				content: interaction.translate("moderation/warn:WARNED", {

commands/Owner/reload.js

@@ -15,7 +15,7 @@ class Reload extends BaseCommand {
 				.setDescription(client.translate("owner/reload:DESCRIPTION"))
 				.setDMPermission(true)
 				.addStringOption(option => option.setName("command")
-					.setDescription(client.translate("owner/reload:COMMAND"))
+					.setDescription(client.translate("common:COMMAND"))
 					.setRequired(true)),
 			aliases: [],
 			dirname: __dirname,

dashboard/public/docs/updates.md

@@ -1,3 +1,13 @@
+### JaBa v4.1.17
+* Добавлено
+	* Команды *cat* и *dog*.
+
+* Изменения
+	* Переписана команда *help*.
+
+* Исправления
+	* Ошибка команды *warn* если имя пользователя содержит нестандартные символы.
+
 ### JaBa v4.1.16
 * Добавлено
 	* Наконец-то возвращена и починена команда *seek*.

languages/ru-RU/common.json

@@ -4,11 +4,13 @@
 	"APPLY": "Применить",
 	"AUTHOR": "Автор",
 	"AVAILABLE_OPTIONS": "Доступные параметры:",
+	"CATEGORY": "Категория",
 	"CANCEL": "Отменить",
 	"CHANNEL": "Канал",
 	"CHANNELS": "Каналы",
 	"COLOR": "Цвет",
 	"CONTENT": "Содержимое",
+	"COMMAND": "Команда",
 	"CREATION": "Создан",
 	"CREDITS": "Кредиты",
 	"DATE": "Дата",

languages/ru-RU/fun/cat.json

@@ -0,0 +1,5 @@
+{
+	"DESCRIPTION": "Всё как с крабом, только котик",
+	"USAGE": "",
+	"EXAMPLES": "cat"
+}

languages/ru-RU/fun/dog.json

@@ -0,0 +1,5 @@
+{
+	"DESCRIPTION": "Вы не поверите... изображение собачки!",
+	"USAGE": "",
+	"EXAMPLES": "dog"
+}

languages/ru-RU/general/help.json

@@ -3,14 +3,14 @@
 	"USAGE": "(command)",
 	"EXAMPLES": "help\nhelp command:ping",
 	"NOT_FOUND": "Команда {{command}} не найдена",
-	"COMMANDS_IN": "Доступные команды в категории `{{category}}`:",
+	"COMMANDS_IN": "Доступные команды в категории \"{{category}}\":",
 	"FIELD_USAGE": "Использование",
 	"FIELD_DESCRIPTION": "Описание",
 	"FIELD_ALIASES": "Сокращения",
 	"FIELD_EXAMPLES": "Примеры",
 	"NO_ALIAS": "Нет сокращений",
 	"CMD_TITLE": "Помощь по {{cmd}}",
-	"INFO": "● Чтобы получить помощь по определённой команде используйте `help [команда]`",
+	"INFO": "● Чтобы получить помощь по определённой команде используйте `/help [command:command_name]`",
 	"FIELD_PERMISSIONS": "Необходимые права",
 	"NO_REQUIRED_PERMISSION": "Никаких особых прав не нужно",
 	"TITLE": "{{name}} | Команды",

languages/ru-RU/owner/reload.json

@@ -2,7 +2,6 @@
 	"DESCRIPTION": "Перезагрузить команду",
 	"USAGE": "[command]",
 	"EXAMPLES": "reload command:help",
-	"COMMAND": "Команда",
 	"NOT_FOUND": "Команда `{{command}}` не найдена!",
 	"SUCCESS": "Команда `{{command}}` успешно перезагружена!"
 }

languages/uk-UA/common.json

@@ -4,11 +4,13 @@
 	"APPLY": "Застосувати",
 	"AUTHOR": "Автор",
 	"AVAILABLE_OPTIONS": "Доступні параметри:",
+	"CATEGORY": "Категорія",
 	"CANCEL": "Скасувати",
 	"CHANNEL": "Канал",
 	"CHANNELS": "Канали",
 	"COLOR": "Колір",
 	"CONTENT": "Вміст",
+	"COMMAND": "Команда",
 	"CREATION": "Створено",
 	"CREDITS": "Кредити",
 	"DATE": "Дата",
@@ -20,7 +22,9 @@
 	"EMOJI": "Емодзі",
 	"ENABLE": "Увімкнути",
 	"ENABLED": "Увімкнено",
-	"ID": "ID сервера",
+	"SERVER_ID": "ID сервера",
+	"MESSAGE_ID": "ID повідомлення",
+	"USER_ID": "ID користувача",
 	"INT": "Ціле число",
 	"IP": "IP-адреса",
 	"JOINED": "Приєднався",

languages/uk-UA/fun/cat.json

@@ -0,0 +1,5 @@
+{
+	"DESCRIPTION": "Всё как с крабом, только котик",
+	"USAGE": "",
+	"EXAMPLES": "cat"
+}

languages/uk-UA/fun/dog.json

@@ -0,0 +1,5 @@
+{
+	"DESCRIPTION": "Вы не поверите... изображение собачки!",
+	"USAGE": "",
+	"EXAMPLES": "dog"
+}

languages/uk-UA/general/help.json

@@ -10,7 +10,7 @@
 	"FIELD_EXAMPLES": "Приклади",
 	"NO_ALIAS": "Немає скорочень",
 	"CMD_TITLE": "Допомога з {{cmd}}",
-	"INFO": "● Щоб отримати допомогу по певній команді, використовуйте `help [команда]`",
+	"INFO": "● Щоб отримати допомогу по певній команді, використовуйте `/help [command:command_name]`",
 	"FIELD_PERMISSIONS": "Необхідні права",
 	"NO_REQUIRED_PERMISSION": "Жодних особливих прав не потрібно",
 	"TITLE": "{{name}} | Команди",

languages/uk-UA/owner/reload.json

@@ -2,7 +2,6 @@
 	"DESCRIPTION": "Перезавантажити команду",
 	"USAGE": "[command]",
 	"EXAMPLES": "reload command:help",
-	"COMMAND": "Команда",
 	"NOT_FOUND": "Команда `{{command}}` не знайдена!",
 	"SUCCESS": "Команда `{{command}}` успішно перезавантажена!"
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "jaba",
-    "version": "4.1.16",
+    "version": "4.1.17",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "jaba",
-            "version": "4.1.16",
+            "version": "4.1.17",
             "license": "ISC",
             "dependencies": {
                 "@discord-player/extractor": "^3.0.2",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jaba",
-    "version": "4.1.16",
+    "version": "4.1.17",
     "description": "My Discord Bot",
     "main": "index.js",
     "private": true,