From 040870770d7c32ab766c62e88b695e4236b008a0 Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Wed, 29 Jul 2026 15:22:12 +0200 Subject: [PATCH] refactor: add all CommandCategories constants, update HelpCategories to use them - Add 12 constants to CommandCategories (ECONOMY, ENTERTAINMENT, SETTINGS, MODERATION, MUSIC, RADIO, UTILITY, INFORMATION, STATISTICS, SYSTEM, SUPER_ADMIN, ROLES) - Replace all ~74 hardcoded getCategory() return strings with CommandCategories constants - Update HelpCategories emojis, colors, descriptions to use constants - Add missing HelpCategories entries for economy, music, radio, info, measurements - Remove old rating command files (duplicated by new subpackage versions) - Fix EntertainmentCommandRegistrar imports and remove RateCommand --- .../loki/command/CommandCategories.java | 17 ++-- .../creator/loki/embed/HelpCategories.java | 76 +++++++++------- .../commands/GenerateRatingsCommand.java | 3 +- .../service/CounterSetupPrefixCommand.java | 3 +- .../economy/command/bank/BankCommand.java | 3 +- .../economy/command/core/BalanceCommand.java | 3 +- .../economy/command/core/BaltopCommand.java | 3 +- .../economy/command/core/DailyCommand.java | 3 +- .../economy/command/core/PayCommand.java | 3 +- .../economy/command/job/JobCommand.java | 3 +- .../economy/command/job/WorkCommand.java | 3 +- .../command/minigame/BlackjackCommand.java | 3 +- .../economy/command/minigame/FishCommand.java | 3 +- .../economy/command/minigame/SlotCommand.java | 3 +- .../economy/command/social/RobCommand.java | 3 +- .../EntertainmentCommandRegistrar.java | 28 +++--- .../commands/GlazbobaCommand.java | 3 +- .../entertainment/commands/MemeCommand.java | 3 +- .../commands/choice/RandomChoiceCommand.java | 3 +- .../commands/random/CoinCommand.java | 3 +- .../commands/random/DiceCommand.java | 3 +- .../commands/random/EightBallCommand.java | 3 +- .../feature/help/commands/HelpCommand.java | 3 +- .../feature/info/commands/AvatarCommand.java | 3 +- .../feature/info/commands/InfoCommand.java | 3 +- .../feature/info/commands/PingCommand.java | 3 +- .../info/commands/ServerStatsCommand.java | 3 +- .../leaderboard/LeaderboardCommand.java | 3 +- .../level/commands/LevelRoleCommand.java | 3 +- .../commands/admin/ResetLevelsCommand.java | 3 +- .../level/commands/admin/StatsCommand.java | 3 +- .../logging/LogSetupPrefixCommand.java | 3 +- .../metrics/commands/MetricsCommand.java | 3 +- .../caselookup/CaseLookupCommand.java | 3 +- .../commands/punish/MuteCommand.java | 3 +- .../commands/punish/PunishCommand.java | 3 +- .../commands/punish/UnmuteCommand.java | 3 +- .../moderation/commands/swap/SwapCommand.java | 3 +- .../commands/utils/ClearCommand.java | 3 +- .../commands/utils/SlowmodeCommand.java | 3 +- .../commands/warn/UnwarnCommand.java | 3 +- .../moderation/commands/warn/WarnCommand.java | 3 +- .../commands/warn/WarningsHistoryCommand.java | 3 +- .../music/commands/FilterCommands.java | 5 +- .../music/commands/PlayerCommands.java | 7 +- .../loki/feature/music/play/PlayCommand.java | 3 +- .../profile/command/ProfileCommand.java | 3 +- .../feature/radio/commands/RadioCommand.java | 3 +- .../feature/rating/commands/AuraCommand.java | 88 ------------------- .../rating/commands/BoykisserCommand.java | 72 --------------- .../feature/rating/commands/FatCommand.java | 68 -------------- .../feature/rating/commands/GayCommand.java | 71 --------------- .../feature/rating/commands/GlazeCommand.java | 64 -------------- .../feature/rating/commands/GoonCommand.java | 67 -------------- .../feature/rating/commands/IqCommand.java | 70 --------------- .../feature/rating/commands/LuckCommand.java | 67 -------------- .../rating/commands/MustacheCommand.java | 76 ---------------- .../feature/rating/commands/PpCommand.java | 79 ----------------- .../feature/rating/commands/RateCommand.java | 79 ----------------- .../feature/rating/commands/RizzCommand.java | 67 -------------- .../feature/rating/commands/SimpCommand.java | 64 -------------- .../feature/rating/commands/VibeCommand.java | 64 -------------- .../commands/ReactionRoleCommand.java | 3 +- .../feature/reputation/MinusRepCommand.java | 3 +- .../loki/feature/reputation/RepCommand.java | 3 +- .../feature/reputation/RepTopCommand.java | 3 +- .../loki/feature/roast/AgrCommand.java | 3 +- .../loki/feature/roast/DossierCommand.java | 3 +- .../role/command/CreateRoleCommand.java | 3 +- .../role/command/DeleteRoleCommand.java | 3 +- .../feature/role/command/EditRoleCommand.java | 3 +- .../feature/role/command/MyRolesCommand.java | 3 +- .../loki/feature/ship/ShipCommand.java | 3 +- .../ticket/commands/TicketSetupCommand.java | 3 +- .../loki/feature/tiktok/TikTokCommand.java | 3 +- .../loki/feature/utility/TimerCommand.java | 3 +- .../feature/utility/commands/PollCommand.java | 3 +- .../service/VoiceSetupPrefixCommand.java | 3 +- 78 files changed, 194 insertions(+), 1112 deletions(-) delete mode 100644 src/main/java/creator/loki/feature/rating/commands/AuraCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/FatCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/GayCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/GlazeCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/GoonCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/IqCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/LuckCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/PpCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/RateCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/RizzCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/SimpCommand.java delete mode 100644 src/main/java/creator/loki/feature/rating/commands/VibeCommand.java diff --git a/src/main/java/creator/loki/command/CommandCategories.java b/src/main/java/creator/loki/command/CommandCategories.java index 330ca57..613e885 100644 --- a/src/main/java/creator/loki/command/CommandCategories.java +++ b/src/main/java/creator/loki/command/CommandCategories.java @@ -3,13 +3,20 @@ package creator.loki.command; /** Имена категорий для {@link Command#getCategory()} (справка, селектор help). */ public final class CommandCategories { - /** Команды с GIF (nekos.life): hug, slap, poke и т.п. */ + public static final String ECONOMY = "Экономика"; + public static final String ENTERTAINMENT = "Развлечения"; + public static final String SETTINGS = "Настройка"; + public static final String MODERATION = "Модерация"; + public static final String MUSIC = "Музыка"; + public static final String RADIO = "Радио"; + public static final String UTILITY = "Утилиты"; + public static final String INFORMATION = "Информация"; + public static final String STATISTICS = "Статистика"; + public static final String SYSTEM = "Система"; + public static final String SUPER_ADMIN = "Супер-Админ"; + public static final String ROLES = "Роли"; public static final String GIF_INTERACTIVE = "GIF-интерактив"; - - /** Команды для поиска изображений (e621, gelbooru, yande.re) — только в NSFW-каналах. */ public static final String NSFW_IMAGES = "NSFW"; - - /** Команды измерений: pp, fat, aura и подобные. */ public static final String MEASUREMENTS = "Измерения"; private CommandCategories() {} diff --git a/src/main/java/creator/loki/embed/HelpCategories.java b/src/main/java/creator/loki/embed/HelpCategories.java index 6ba47f0..487c441 100644 --- a/src/main/java/creator/loki/embed/HelpCategories.java +++ b/src/main/java/creator/loki/embed/HelpCategories.java @@ -13,46 +13,58 @@ public final class HelpCategories { static { EMOJIS = Map.ofEntries( - Map.entry("Общие", "📋"), - Map.entry("Роли", "🎭"), - Map.entry("Развлечения", "🎮"), + Map.entry(CommandCategories.ECONOMY, "💰"), + Map.entry(CommandCategories.ENTERTAINMENT, "🎮"), + Map.entry(CommandCategories.SETTINGS, "⚙️"), + Map.entry(CommandCategories.MODERATION, "🛡️"), + Map.entry(CommandCategories.MUSIC, "🎵"), + Map.entry(CommandCategories.RADIO, "📻"), + Map.entry(CommandCategories.UTILITY, "🔧"), + Map.entry(CommandCategories.INFORMATION, "ℹ️"), + Map.entry(CommandCategories.STATISTICS, "📊"), + Map.entry(CommandCategories.SYSTEM, "💠"), + Map.entry(CommandCategories.SUPER_ADMIN, "🔐"), + Map.entry(CommandCategories.ROLES, "🎭"), Map.entry(CommandCategories.GIF_INTERACTIVE, "💞"), - Map.entry("Модерация", "🛡️"), - Map.entry("Статистика", "📊"), - Map.entry("Утилиты", "🔧"), - Map.entry("Система", "💠"), - Map.entry("Настройка", "⚙️"), - Map.entry("Супер-Админ", "🔐"), - Map.entry(CommandCategories.NSFW_IMAGES, "🔞")); + Map.entry(CommandCategories.NSFW_IMAGES, "🔞"), + Map.entry(CommandCategories.MEASUREMENTS, "📏")); COLORS = Map.ofEntries( - Map.entry("Общие", new Color(52, 152, 219)), - Map.entry("Роли", new Color(155, 89, 182)), - Map.entry("Развлечения", new Color(241, 196, 15)), + Map.entry(CommandCategories.ECONOMY, new Color(241, 196, 15)), + Map.entry(CommandCategories.ENTERTAINMENT, new Color(241, 196, 15)), + Map.entry(CommandCategories.SETTINGS, new Color(149, 165, 166)), + Map.entry(CommandCategories.MODERATION, new Color(231, 76, 60)), + Map.entry(CommandCategories.MUSIC, new Color(46, 204, 113)), + Map.entry(CommandCategories.RADIO, new Color(46, 204, 113)), + Map.entry(CommandCategories.UTILITY, new Color(52, 152, 219)), + Map.entry(CommandCategories.INFORMATION, new Color(52, 152, 219)), + Map.entry(CommandCategories.STATISTICS, new Color(46, 204, 113)), + Map.entry(CommandCategories.SYSTEM, new Color(52, 73, 94)), + Map.entry(CommandCategories.SUPER_ADMIN, new Color(113, 54, 138)), + Map.entry(CommandCategories.ROLES, new Color(155, 89, 182)), Map.entry(CommandCategories.GIF_INTERACTIVE, new Color(233, 30, 99)), - Map.entry("Модерация", new Color(231, 76, 60)), - Map.entry("Статистика", new Color(46, 204, 113)), - Map.entry("Утилиты", new Color(52, 152, 219)), - Map.entry("Система", new Color(52, 73, 94)), - Map.entry("Настройка", new Color(149, 165, 166)), - Map.entry("Супер-Админ", new Color(113, 54, 138)), - Map.entry(CommandCategories.NSFW_IMAGES, new Color(180, 0, 0))); + Map.entry(CommandCategories.NSFW_IMAGES, new Color(180, 0, 0)), + Map.entry(CommandCategories.MEASUREMENTS, new Color(255, 159, 67))); DESCRIPTIONS = Map.ofEntries( - Map.entry("Общие", "Основные команды бота"), - Map.entry("Роли", "Управление кастомными ролями"), - Map.entry("Развлечения", "Игры, мемы, рейтинги, текст"), + Map.entry(CommandCategories.ECONOMY, "Экономические команды и мини-игры"), + Map.entry(CommandCategories.ENTERTAINMENT, "Игры, мемы, рейтинги, текст"), + Map.entry(CommandCategories.SETTINGS, "Настройка систем бота (только админы)"), + Map.entry(CommandCategories.MODERATION, "Команды модерации сервера"), + Map.entry(CommandCategories.MUSIC, "Управление музыкой и плеером"), + Map.entry(CommandCategories.RADIO, "Слушать радио в голосовом канале"), + Map.entry(CommandCategories.UTILITY, "Полезные инструменты"), + Map.entry(CommandCategories.INFORMATION, "Информация о сервере и пользователях"), + Map.entry(CommandCategories.STATISTICS, "Уровни, репутация и статистика"), + Map.entry(CommandCategories.SYSTEM, "Метрики и служебная информация для админов"), + Map.entry(CommandCategories.SUPER_ADMIN, "Сервисные команды владельца бота"), + Map.entry(CommandCategories.ROLES, "Управление кастомными ролями"), Map.entry( CommandCategories.GIF_INTERACTIVE, "Действия с участником в GIF (nekos.life)"), - Map.entry("Модерация", "Команды модерации сервера"), - Map.entry("Статистика", "Уровни, репутация и статистика"), - Map.entry("Утилиты", "Полезные инструменты"), - Map.entry("Система", "Метрики и служебная информация для админов"), - Map.entry("Настройка", "Настройка систем бота (только админы)"), - Map.entry("Супер-Админ", "Сервисные команды владельца бота"), - Map.entry(CommandCategories.NSFW_IMAGES, "Поиск изображений (только в NSFW каналах)")); + Map.entry(CommandCategories.NSFW_IMAGES, "Поиск изображений (только в NSFW каналах)"), + Map.entry(CommandCategories.MEASUREMENTS, "Забавные измерительные команды")); } private HelpCategories() {} @@ -71,10 +83,10 @@ public final class HelpCategories { public static boolean isCategoryVisible( String category, boolean isAdmin, boolean isSuper, boolean isNsfwChannel) { - if ("Настройка".equals(category) && !isAdmin) { + if (CommandCategories.SETTINGS.equals(category) && !isAdmin) { return false; } - if ("Супер-Админ".equals(category) && !isSuper) { + if (CommandCategories.SUPER_ADMIN.equals(category) && !isSuper) { return false; } if (CommandCategories.NSFW_IMAGES.equals(category) && !isNsfwChannel) { diff --git a/src/main/java/creator/loki/feature/admin/commands/GenerateRatingsCommand.java b/src/main/java/creator/loki/feature/admin/commands/GenerateRatingsCommand.java index 237dbe8..7063a79 100644 --- a/src/main/java/creator/loki/feature/admin/commands/GenerateRatingsCommand.java +++ b/src/main/java/creator/loki/feature/admin/commands/GenerateRatingsCommand.java @@ -12,6 +12,7 @@ import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.MessageEmbed; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import creator.loki.command.CommandCategories; public class GenerateRatingsCommand implements Command { private static final Logger logger = LoggerFactory.getLogger(GenerateRatingsCommand.class); @@ -41,7 +42,7 @@ public class GenerateRatingsCommand implements Command { @Override public String getCategory() { - return "Супер-Админ"; + return CommandCategories.SUPER_ADMIN; } @Override diff --git a/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java b/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java index 0a6c0e3..9799b49 100644 --- a/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java +++ b/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java @@ -9,6 +9,7 @@ import creator.loki.util.GuildChannelResolve; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import creator.loki.feature.counter.service.format.CounterConfigFormatter; +import creator.loki.command.CommandCategories; public class CounterSetupPrefixCommand implements Command { private final CounterManager counterManager; @@ -36,7 +37,7 @@ public class CounterSetupPrefixCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/bank/BankCommand.java b/src/main/java/creator/loki/feature/economy/command/bank/BankCommand.java index 2cde1ee..5c696ef 100644 --- a/src/main/java/creator/loki/feature/economy/command/bank/BankCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/bank/BankCommand.java @@ -9,6 +9,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.domain.EconomyAccount; import creator.loki.feature.economy.service.EconomyService; +import creator.loki.command.CommandCategories; public class BankCommand implements Command { private final EconomyService economyService; @@ -34,7 +35,7 @@ public class BankCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/core/BalanceCommand.java b/src/main/java/creator/loki/feature/economy/command/core/BalanceCommand.java index 664285d..aeb9dbc 100644 --- a/src/main/java/creator/loki/feature/economy/command/core/BalanceCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/core/BalanceCommand.java @@ -9,6 +9,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.feature.economy.domain.EconomyAccount; import creator.loki.feature.economy.service.EconomyService; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class BalanceCommand implements Command { private final EconomyService economyService; @@ -34,7 +35,7 @@ public class BalanceCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/core/BaltopCommand.java b/src/main/java/creator/loki/feature/economy/command/core/BaltopCommand.java index 40a28d1..a57f794 100644 --- a/src/main/java/creator/loki/feature/economy/command/core/BaltopCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/core/BaltopCommand.java @@ -8,6 +8,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.feature.economy.domain.EconomyAccount; import creator.loki.feature.economy.service.EconomyService; +import creator.loki.command.CommandCategories; public class BaltopCommand implements Command { private final EconomyService economyService; @@ -28,7 +29,7 @@ public class BaltopCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/core/DailyCommand.java b/src/main/java/creator/loki/feature/economy/command/core/DailyCommand.java index 68115e3..49256e7 100644 --- a/src/main/java/creator/loki/feature/economy/command/core/DailyCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/core/DailyCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.EconomyService; +import creator.loki.command.CommandCategories; public class DailyCommand implements Command { private final EconomyService economyService; @@ -27,7 +28,7 @@ public class DailyCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/core/PayCommand.java b/src/main/java/creator/loki/feature/economy/command/core/PayCommand.java index 6c89806..25bc0c4 100644 --- a/src/main/java/creator/loki/feature/economy/command/core/PayCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/core/PayCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.EconomyService; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class PayCommand implements Command { private final EconomyService economyService; @@ -32,7 +33,7 @@ public class PayCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/job/JobCommand.java b/src/main/java/creator/loki/feature/economy/command/job/JobCommand.java index 095f1c0..8dc9cf7 100644 --- a/src/main/java/creator/loki/feature/economy/command/job/JobCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/job/JobCommand.java @@ -8,6 +8,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.game.JobService; import creator.loki.feature.economy.service.game.JobService; +import creator.loki.command.CommandCategories; public class JobCommand implements Command { @@ -34,7 +35,7 @@ public class JobCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/job/WorkCommand.java b/src/main/java/creator/loki/feature/economy/command/job/WorkCommand.java index 5fe2b91..d88275f 100644 --- a/src/main/java/creator/loki/feature/economy/command/job/WorkCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/job/WorkCommand.java @@ -8,6 +8,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.game.JobService; import creator.loki.feature.economy.service.game.JobService; +import creator.loki.command.CommandCategories; public class WorkCommand implements Command { @@ -29,7 +30,7 @@ public class WorkCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/minigame/BlackjackCommand.java b/src/main/java/creator/loki/feature/economy/command/minigame/BlackjackCommand.java index 22b4297..b68581d 100644 --- a/src/main/java/creator/loki/feature/economy/command/minigame/BlackjackCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/minigame/BlackjackCommand.java @@ -11,6 +11,7 @@ import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.game.BlackjackService; import creator.loki.feature.economy.service.EconomyService; import net.dv8tion.jda.api.entities.MessageEmbed; +import creator.loki.command.CommandCategories; public class BlackjackCommand implements Command { @@ -40,7 +41,7 @@ public class BlackjackCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/minigame/FishCommand.java b/src/main/java/creator/loki/feature/economy/command/minigame/FishCommand.java index aa5e7ba..deb0890 100644 --- a/src/main/java/creator/loki/feature/economy/command/minigame/FishCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/minigame/FishCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.FishingService; +import creator.loki.command.CommandCategories; public class FishCommand implements Command { @@ -33,7 +34,7 @@ public class FishCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/minigame/SlotCommand.java b/src/main/java/creator/loki/feature/economy/command/minigame/SlotCommand.java index 9d54e2d..dfbfe1f 100644 --- a/src/main/java/creator/loki/feature/economy/command/minigame/SlotCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/minigame/SlotCommand.java @@ -8,6 +8,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.EconomyService; import creator.loki.feature.economy.service.game.SlotService; +import creator.loki.command.CommandCategories; public class SlotCommand implements Command { @@ -36,7 +37,7 @@ public class SlotCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/economy/command/social/RobCommand.java b/src/main/java/creator/loki/feature/economy/command/social/RobCommand.java index 9a80b37..dd6010e 100644 --- a/src/main/java/creator/loki/feature/economy/command/social/RobCommand.java +++ b/src/main/java/creator/loki/feature/economy/command/social/RobCommand.java @@ -12,6 +12,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.economy.service.EconomyService; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class RobCommand implements Command { private final EconomyService economyService; @@ -41,7 +42,7 @@ public class RobCommand implements Command { @Override public String getCategory() { - return "Экономика"; + return CommandCategories.ECONOMY; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java b/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java index 6b432ed..5a39b0f 100644 --- a/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java +++ b/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java @@ -12,20 +12,19 @@ import creator.loki.feature.entertainment.commands.random.DiceCommand; import creator.loki.feature.entertainment.commands.random.EightBallCommand; import creator.loki.feature.entertainment.commands.choice.RandomChoiceCommand; import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.commands.AuraCommand; -import creator.loki.feature.rating.commands.BoykisserCommand; -import creator.loki.feature.rating.commands.FatCommand; -import creator.loki.feature.rating.commands.GayCommand; -import creator.loki.feature.rating.commands.GlazeCommand; -import creator.loki.feature.rating.commands.GoonCommand; -import creator.loki.feature.rating.commands.IqCommand; -import creator.loki.feature.rating.commands.LuckCommand; -import creator.loki.feature.rating.commands.MustacheCommand; -import creator.loki.feature.rating.commands.PpCommand; -import creator.loki.feature.rating.commands.RateCommand; -import creator.loki.feature.rating.commands.RizzCommand; -import creator.loki.feature.rating.commands.SimpCommand; -import creator.loki.feature.rating.commands.VibeCommand; +import creator.loki.feature.rating.commands.body.FatCommand; +import creator.loki.feature.rating.commands.body.MustacheCommand; +import creator.loki.feature.rating.commands.body.PpCommand; +import creator.loki.feature.rating.commands.fortune.AuraCommand; +import creator.loki.feature.rating.commands.fortune.LuckCommand; +import creator.loki.feature.rating.commands.fortune.RizzCommand; +import creator.loki.feature.rating.commands.mind.BoykisserCommand; +import creator.loki.feature.rating.commands.mind.GayCommand; +import creator.loki.feature.rating.commands.mind.IqCommand; +import creator.loki.feature.rating.commands.vibe.GlazeCommand; +import creator.loki.feature.rating.commands.vibe.GoonCommand; +import creator.loki.feature.rating.commands.vibe.SimpCommand; +import creator.loki.feature.rating.commands.vibe.VibeCommand; import creator.loki.feature.ship.ShipCommand; import creator.loki.feature.ship.repository.ShipPairRepository; import creator.loki.feature.social.commands.ComplimentCommand; @@ -70,7 +69,6 @@ public class EntertainmentCommandRegistrar implements CommandRegistrar { registry.register(new IqCommand(ratingService)); registry.register(new GayCommand(ratingService)); registry.register(new PpCommand(ratingService)); - registry.register(new RateCommand(ratingService)); registry.register(new BoykisserCommand(ratingService)); registry.register(new MustacheCommand(ratingService)); registry.register(new FatCommand(ratingService)); diff --git a/src/main/java/creator/loki/feature/entertainment/commands/GlazbobaCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/GlazbobaCommand.java index 8a32270..7d89f2c 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/GlazbobaCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/GlazbobaCommand.java @@ -9,6 +9,7 @@ import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class GlazbobaCommand implements Command { @@ -29,7 +30,7 @@ public class GlazbobaCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/commands/MemeCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/MemeCommand.java index e308988..bb51e86 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/MemeCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/MemeCommand.java @@ -12,6 +12,7 @@ import com.google.gson.JsonParser; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; +import creator.loki.command.CommandCategories; public class MemeCommand implements Command { @@ -32,7 +33,7 @@ public class MemeCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/commands/choice/RandomChoiceCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/choice/RandomChoiceCommand.java index 5c115d5..fbb669c 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/choice/RandomChoiceCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/choice/RandomChoiceCommand.java @@ -11,6 +11,7 @@ import creator.loki.embed.EmbedTemplates; import net.dv8tion.jda.api.EmbedBuilder; import creator.loki.feature.utility.ChoiceOptionParser; import creator.loki.feature.utility.ChoiceOptionParser; +import creator.loki.command.CommandCategories; /** Случайный выбор из вариантов. Разбор строки - {@link ChoiceOptionParser}. */ public class RandomChoiceCommand implements Command { @@ -83,7 +84,7 @@ public class RandomChoiceCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java index 8ec37df..780b0ae 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java @@ -6,6 +6,7 @@ import java.util.Random; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; +import creator.loki.command.CommandCategories; public class CoinCommand implements Command { private final Random random = new Random(); @@ -27,7 +28,7 @@ public class CoinCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java index 86adfa8..b4076cb 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java @@ -6,6 +6,7 @@ import java.util.Random; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; +import creator.loki.command.CommandCategories; public class DiceCommand implements Command { private final Random random = new Random(); @@ -27,7 +28,7 @@ public class DiceCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java index d4eb4c6..914d55f 100644 --- a/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java +++ b/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java @@ -6,6 +6,7 @@ import java.util.Random; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; +import creator.loki.command.CommandCategories; public class EightBallCommand implements Command { private final Random random = new Random(); @@ -49,7 +50,7 @@ public class EightBallCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/help/commands/HelpCommand.java b/src/main/java/creator/loki/feature/help/commands/HelpCommand.java index 97e4a25..d084734 100644 --- a/src/main/java/creator/loki/feature/help/commands/HelpCommand.java +++ b/src/main/java/creator/loki/feature/help/commands/HelpCommand.java @@ -16,6 +16,7 @@ import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.selections.StringSelectMenu; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel; +import creator.loki.command.CommandCategories; public class HelpCommand implements Command { private final CommandRegistry registry; @@ -159,6 +160,6 @@ public class HelpCommand implements Command { @Override public String getCategory() { - return "Утилиты"; + return CommandCategories.UTILITY; } } diff --git a/src/main/java/creator/loki/feature/info/commands/AvatarCommand.java b/src/main/java/creator/loki/feature/info/commands/AvatarCommand.java index 7f244dd..dbf30b1 100644 --- a/src/main/java/creator/loki/feature/info/commands/AvatarCommand.java +++ b/src/main/java/creator/loki/feature/info/commands/AvatarCommand.java @@ -8,6 +8,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; +import creator.loki.command.CommandCategories; public class AvatarCommand implements Command { @@ -28,7 +29,7 @@ public class AvatarCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/info/commands/InfoCommand.java b/src/main/java/creator/loki/feature/info/commands/InfoCommand.java index 27df80f..067e9f3 100644 --- a/src/main/java/creator/loki/feature/info/commands/InfoCommand.java +++ b/src/main/java/creator/loki/feature/info/commands/InfoCommand.java @@ -12,6 +12,7 @@ import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.User; +import creator.loki.command.CommandCategories; public class InfoCommand implements Command { @@ -114,6 +115,6 @@ public class InfoCommand implements Command { @Override public String getCategory() { - return "Утилиты"; + return CommandCategories.UTILITY; } } diff --git a/src/main/java/creator/loki/feature/info/commands/PingCommand.java b/src/main/java/creator/loki/feature/info/commands/PingCommand.java index cf7c709..38e55ee 100644 --- a/src/main/java/creator/loki/feature/info/commands/PingCommand.java +++ b/src/main/java/creator/loki/feature/info/commands/PingCommand.java @@ -5,6 +5,7 @@ import java.awt.Color; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; +import creator.loki.command.CommandCategories; public class PingCommand implements Command { @@ -44,6 +45,6 @@ public class PingCommand implements Command { @Override public String getCategory() { - return "Утилиты"; + return CommandCategories.UTILITY; } } diff --git a/src/main/java/creator/loki/feature/info/commands/ServerStatsCommand.java b/src/main/java/creator/loki/feature/info/commands/ServerStatsCommand.java index aefb44f..aa98c4b 100644 --- a/src/main/java/creator/loki/feature/info/commands/ServerStatsCommand.java +++ b/src/main/java/creator/loki/feature/info/commands/ServerStatsCommand.java @@ -9,6 +9,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.feature.serverstats.ServerStatsService; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.utils.FileUpload; +import creator.loki.command.CommandCategories; public class ServerStatsCommand implements Command { private final ServerStatsService statsService; @@ -34,7 +35,7 @@ public class ServerStatsCommand implements Command { @Override public String getCategory() { - return "Информация"; + return CommandCategories.INFORMATION; } @Override diff --git a/src/main/java/creator/loki/feature/leaderboard/LeaderboardCommand.java b/src/main/java/creator/loki/feature/leaderboard/LeaderboardCommand.java index 3f2432c..ad00375 100644 --- a/src/main/java/creator/loki/feature/leaderboard/LeaderboardCommand.java +++ b/src/main/java/creator/loki/feature/leaderboard/LeaderboardCommand.java @@ -6,6 +6,7 @@ import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.feature.level.service.LeaderboardService; import net.dv8tion.jda.api.components.actionrow.ActionRow; +import creator.loki.command.CommandCategories; /** Команда таблицы лидеров (рефакторинг: 241 → 50 строк) */ public class LeaderboardCommand implements Command { @@ -32,7 +33,7 @@ public class LeaderboardCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java b/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java index 1303427..be66e29 100644 --- a/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java +++ b/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java @@ -10,6 +10,7 @@ import creator.loki.feature.config.repository.ConfigRepository; import creator.loki.feature.level.service.LevelRoleService; import net.dv8tion.jda.api.Permission; import creator.loki.feature.level.commands.util.LevelRoleFormatter; +import creator.loki.command.CommandCategories; public class LevelRoleCommand implements Command { private final LevelRoleService levelRoleService; @@ -37,7 +38,7 @@ public class LevelRoleCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/level/commands/admin/ResetLevelsCommand.java b/src/main/java/creator/loki/feature/level/commands/admin/ResetLevelsCommand.java index 53c7c4d..47ea62b 100644 --- a/src/main/java/creator/loki/feature/level/commands/admin/ResetLevelsCommand.java +++ b/src/main/java/creator/loki/feature/level/commands/admin/ResetLevelsCommand.java @@ -14,6 +14,7 @@ import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import creator.loki.command.CommandCategories; /** * Одноразовая команда для сброса уровней и XP всех пользователей Сохраняет время в войсе и @@ -48,7 +49,7 @@ public class ResetLevelsCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/level/commands/admin/StatsCommand.java b/src/main/java/creator/loki/feature/level/commands/admin/StatsCommand.java index e2c4133..582a160 100644 --- a/src/main/java/creator/loki/feature/level/commands/admin/StatsCommand.java +++ b/src/main/java/creator/loki/feature/level/commands/admin/StatsCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Guild; +import creator.loki.command.CommandCategories; public class StatsCommand implements Command { @@ -27,7 +28,7 @@ public class StatsCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/logging/LogSetupPrefixCommand.java b/src/main/java/creator/loki/feature/logging/LogSetupPrefixCommand.java index d179287..82484fe 100644 --- a/src/main/java/creator/loki/feature/logging/LogSetupPrefixCommand.java +++ b/src/main/java/creator/loki/feature/logging/LogSetupPrefixCommand.java @@ -10,6 +10,7 @@ import creator.loki.feature.config.repository.ConfigRepository; import creator.loki.util.GuildChannelResolve; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import creator.loki.command.CommandCategories; /** Настройка каналов логирования через префиксную команду {@code log-setup}. */ public class LogSetupPrefixCommand implements Command { @@ -36,7 +37,7 @@ public class LogSetupPrefixCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/metrics/commands/MetricsCommand.java b/src/main/java/creator/loki/feature/metrics/commands/MetricsCommand.java index 0ae2a8e..dcc4c47 100644 --- a/src/main/java/creator/loki/feature/metrics/commands/MetricsCommand.java +++ b/src/main/java/creator/loki/feature/metrics/commands/MetricsCommand.java @@ -9,6 +9,7 @@ import creator.loki.config.BotConfig; import creator.loki.embed.EmbedFactory; import creator.loki.feature.metrics.MetricsCollector; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class MetricsCommand implements Command { private final MetricsCollector metrics; @@ -82,6 +83,6 @@ public class MetricsCommand implements Command { @Override public String getCategory() { - return "Система"; + return CommandCategories.SYSTEM; } } diff --git a/src/main/java/creator/loki/feature/moderation/commands/caselookup/CaseLookupCommand.java b/src/main/java/creator/loki/feature/moderation/commands/caselookup/CaseLookupCommand.java index 97e8be3..c569d45 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/caselookup/CaseLookupCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/caselookup/CaseLookupCommand.java @@ -8,6 +8,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.feature.moderation.repository.ModerationCaseRepository; import creator.loki.feature.moderation.util.ModerationHelper; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class CaseLookupCommand implements Command { private final ModerationCaseRepository cases; @@ -33,7 +34,7 @@ public class CaseLookupCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/punish/MuteCommand.java b/src/main/java/creator/loki/feature/moderation/commands/punish/MuteCommand.java index 462d937..05f153e 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/punish/MuteCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/punish/MuteCommand.java @@ -17,6 +17,7 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class MuteCommand implements Command { private static final int MAX_REASON_LENGTH = 500; @@ -57,7 +58,7 @@ public class MuteCommand implements Command { } public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/punish/PunishCommand.java b/src/main/java/creator/loki/feature/moderation/commands/punish/PunishCommand.java index f0eaed7..7dfaf0c 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/punish/PunishCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/punish/PunishCommand.java @@ -9,6 +9,7 @@ import creator.loki.feature.moderation.util.ModerationHelper; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public final class PunishCommand { private PunishCommand() {} @@ -58,7 +59,7 @@ public final class PunishCommand { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/punish/UnmuteCommand.java b/src/main/java/creator/loki/feature/moderation/commands/punish/UnmuteCommand.java index 9bec7af..f95ef87 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/punish/UnmuteCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/punish/UnmuteCommand.java @@ -16,6 +16,7 @@ import creator.loki.feature.moderation.repository.ModerationCaseRepository; import creator.loki.feature.moderation.util.ModerationHelper; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class UnmuteCommand implements Command { private final ModerationCaseRepository cases; @@ -54,7 +55,7 @@ public class UnmuteCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/swap/SwapCommand.java b/src/main/java/creator/loki/feature/moderation/commands/swap/SwapCommand.java index b6a8ddf..a91c41f 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/swap/SwapCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/swap/SwapCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.moderation.util.ModerationHelper; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class SwapCommand implements Command { private final Random random = new Random(); @@ -28,7 +29,7 @@ public class SwapCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/utils/ClearCommand.java b/src/main/java/creator/loki/feature/moderation/commands/utils/ClearCommand.java index fe8beef..8bb9bcf 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/utils/ClearCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/utils/ClearCommand.java @@ -11,6 +11,7 @@ import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; +import creator.loki.command.CommandCategories; public class ClearCommand implements Command { @Override @@ -30,7 +31,7 @@ public class ClearCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/utils/SlowmodeCommand.java b/src/main/java/creator/loki/feature/moderation/commands/utils/SlowmodeCommand.java index a02a85e..fb3ea5c 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/utils/SlowmodeCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/utils/SlowmodeCommand.java @@ -5,6 +5,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.attribute.ISlowmodeChannel; +import creator.loki.command.CommandCategories; public class SlowmodeCommand implements Command { @Override @@ -24,7 +25,7 @@ public class SlowmodeCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/warn/UnwarnCommand.java b/src/main/java/creator/loki/feature/moderation/commands/warn/UnwarnCommand.java index 7ab0277..72c0bbf 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/warn/UnwarnCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/warn/UnwarnCommand.java @@ -5,6 +5,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.moderation.repository.WarningRepository; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class UnwarnCommand implements Command { private final WarningRepository warnings; @@ -30,7 +31,7 @@ public class UnwarnCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/warn/WarnCommand.java b/src/main/java/creator/loki/feature/moderation/commands/warn/WarnCommand.java index 56f6820..f31339b 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/warn/WarnCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/warn/WarnCommand.java @@ -19,6 +19,7 @@ import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class WarnCommand implements Command { private static final long AUTO_MUTE_HOURS = 1; @@ -62,7 +63,7 @@ public class WarnCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/moderation/commands/warn/WarningsHistoryCommand.java b/src/main/java/creator/loki/feature/moderation/commands/warn/WarningsHistoryCommand.java index 672ca80..0275aa6 100644 --- a/src/main/java/creator/loki/feature/moderation/commands/warn/WarningsHistoryCommand.java +++ b/src/main/java/creator/loki/feature/moderation/commands/warn/WarningsHistoryCommand.java @@ -9,6 +9,7 @@ import creator.loki.feature.moderation.repository.WarningRepository; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class WarningsHistoryCommand implements Command { private final WarningRepository warnings; @@ -34,7 +35,7 @@ public class WarningsHistoryCommand implements Command { @Override public String getCategory() { - return "Модерация"; + return CommandCategories.MODERATION; } @Override diff --git a/src/main/java/creator/loki/feature/music/commands/FilterCommands.java b/src/main/java/creator/loki/feature/music/commands/FilterCommands.java index 4d035a0..c0f1c4e 100644 --- a/src/main/java/creator/loki/feature/music/commands/FilterCommands.java +++ b/src/main/java/creator/loki/feature/music/commands/FilterCommands.java @@ -5,6 +5,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.command.CommandCategories; public class FilterCommands { private FilterCommands() {} @@ -69,7 +70,7 @@ public class FilterCommands { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override @@ -154,7 +155,7 @@ public class FilterCommands { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override diff --git a/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java b/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java index 136ab5b..b79ee02 100644 --- a/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java +++ b/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java @@ -5,6 +5,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.command.CommandCategories; public class PlayerCommands { @@ -46,7 +47,7 @@ public class PlayerCommands { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override @@ -106,7 +107,7 @@ public class PlayerCommands { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override @@ -147,7 +148,7 @@ public class PlayerCommands { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override diff --git a/src/main/java/creator/loki/feature/music/play/PlayCommand.java b/src/main/java/creator/loki/feature/music/play/PlayCommand.java index b711645..91d94d9 100644 --- a/src/main/java/creator/loki/feature/music/play/PlayCommand.java +++ b/src/main/java/creator/loki/feature/music/play/PlayCommand.java @@ -14,6 +14,7 @@ import creator.loki.feature.utility.VoiceHelper; import dev.arbjerg.lavalink.client.player.Track; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class PlayCommand implements Command { private static final Set SOURCES = Set.of("yt", "sc", "list"); @@ -42,7 +43,7 @@ public class PlayCommand implements Command { @Override public String getCategory() { - return "Музыка"; + return CommandCategories.MUSIC; } @Override diff --git a/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java b/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java index 4a05abf..7c48f92 100644 --- a/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java +++ b/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java @@ -7,6 +7,7 @@ import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.utils.FileUpload; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import creator.loki.command.CommandCategories; /** Команда для просмотра профиля с красивой карточкой */ public class ProfileCommand implements Command { @@ -34,7 +35,7 @@ public class ProfileCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/radio/commands/RadioCommand.java b/src/main/java/creator/loki/feature/radio/commands/RadioCommand.java index 4e2c2d0..508a736 100644 --- a/src/main/java/creator/loki/feature/radio/commands/RadioCommand.java +++ b/src/main/java/creator/loki/feature/radio/commands/RadioCommand.java @@ -9,6 +9,7 @@ import creator.loki.embed.EmbedTemplates; import creator.loki.feature.radio.service.RadioManager; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class RadioCommand implements Command { private final RadioManager radioManager; @@ -35,7 +36,7 @@ public class RadioCommand implements Command { @Override public String getCategory() { - return "Радио"; + return CommandCategories.RADIO; } @Override diff --git a/src/main/java/creator/loki/feature/rating/commands/AuraCommand.java b/src/main/java/creator/loki/feature/rating/commands/AuraCommand.java deleted file mode 100644 index acf4b69..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/AuraCommand.java +++ /dev/null @@ -1,88 +0,0 @@ -package creator.loki.feature.rating.commands; - -import java.awt.Color; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import net.dv8tion.jda.api.entities.Member; - -public class AuraCommand implements Command { - - private final RatingService ratingService; - - @Inject - public AuraCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "aura"; - } - - @Override - public String getDescription() { - return "Проверить свою ауру (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "aura [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "aura")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int aura = ratingService.getDeterministicValue(target.getId(), 999, -50, 100); - String emoji; - Color color; - if (aura >= 80) { - emoji = "🌟"; - color = new Color(255, 215, 0); - } else if (aura >= 50) { - emoji = "✨"; - color = new Color(100, 255, 150); - } else if (aura >= 20) { - emoji = "😐"; - color = new Color(52, 152, 219); - } else if (aura >= 0) { - emoji = "💫"; - color = new Color(128, 128, 128); - } else if (aura >= -25) { - emoji = "🌑"; - color = new Color(231, 76, 60); - } else { - emoji = "💀"; - color = new Color(100, 0, 0); - } - - StringBuilder bar = new StringBuilder(); - int filled = Math.max(0, Math.min(10, (aura + 50) / 15)); - for (int i = 0; i < filled; i++) bar.append("✧"); - for (int i = filled; i < 10; i++) bar.append("◇"); - - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("✨ Аура") - .withDescription(target.getAsMention()) - .addField("Сила", emoji + " **" + aura + "**\n" + bar, false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(color) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java b/src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java deleted file mode 100644 index 5ce6a97..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java +++ /dev/null @@ -1,72 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class BoykisserCommand implements Command { - - private final RatingService ratingService; - - @Inject - public BoykisserCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "boykisser"; - } - - @Override - public String getDescription() { - return "На сколько ты boykisser (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "boykisser [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "boykisser")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - if (target.getUser().isBot()) { - context.getChannel().sendMessage("❌ Боты не целуют мальчиков!").queue(); - return; - } - - int boykisserLevel = ratingService.getDeterministicValue(target.getId(), 777, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = boykisserLevel / 10; - for (int i = 0; i < filled; i++) bar.append("💋"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - - RatingLevel level = RatingLevel.findLevel(boykisserLevel, RatingConfig.getBoykisserLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("💋 Boykisser Метр") - .withDescription(target.getAsMention()) - .addField( - "Уровень", bar + "\n**" + boykisserLevel + "%** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/FatCommand.java b/src/main/java/creator/loki/feature/rating/commands/FatCommand.java deleted file mode 100644 index 9909a1b..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/FatCommand.java +++ /dev/null @@ -1,68 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class FatCommand implements Command { - - private final RatingService ratingService; - - @Inject - public FatCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "fat"; - } - - @Override - public String getDescription() { - return "Проверка на жирность (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "fat [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "fat")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int fatLevel = ratingService.getDeterministicValue(target.getId(), 999, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = fatLevel / 10; - for (int i = 0; i < filled; i++) bar.append("🟩"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - - RatingLevel level = RatingLevel.findLevel(fatLevel, RatingConfig.getFatLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🐷 Fat Метр") - .withDescription(target.getAsMention()) - .addField( - "Жирность", bar + "\n**" + fatLevel + "%** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/GayCommand.java b/src/main/java/creator/loki/feature/rating/commands/GayCommand.java deleted file mode 100644 index 6cb8188..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/GayCommand.java +++ /dev/null @@ -1,71 +0,0 @@ -package creator.loki.feature.rating.commands; - -import java.awt.Color; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import net.dv8tion.jda.api.entities.Member; - -public class GayCommand implements Command { - - private final RatingService ratingService; - - @Inject - public GayCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "gay"; - } - - @Override - public String getDescription() { - return "Гей-метр (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "gay [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "gay")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - if (target.getUser().isBot()) { - context.getChannel().sendMessage("❌ Боты не имеют ориентации!").queue(); - return; - } - - int gayLevel = ratingService.getDeterministicValue(target.getId(), 456, 0, 100); - String[] rainbow = {"🟥", "🟧", "🟨", "🟩", "🟦", "🟪"}; - StringBuilder bar = new StringBuilder(); - int filled = Math.min(gayLevel / 17 + 1, 6); - for (int i = 0; i < filled; i++) bar.append(rainbow[i]); - for (int i = filled; i < 6; i++) bar.append("⬜"); - - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🏳️‍🌈 Гей-метр") - .withDescription(target.getAsMention()) - .addField("Уровень", bar + "\n**" + gayLevel + "%**", false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(new Color(255, 0, 255)) - .withFooter("💡 Это просто мем, не воспринимайте серьезно") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/GlazeCommand.java b/src/main/java/creator/loki/feature/rating/commands/GlazeCommand.java deleted file mode 100644 index 3912a5b..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/GlazeCommand.java +++ /dev/null @@ -1,64 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class GlazeCommand implements Command { - private final RatingService ratingService; - - @Inject - public GlazeCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "glaze"; - } - - @Override - public String getDescription() { - return "На сколько ты глазированный (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "glaze [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "glaze")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - int level = ratingService.getDeterministicValue(target.getId(), 333, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = level / 10; - for (int i = 0; i < filled; i++) bar.append("🍩"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - RatingLevel rl = RatingLevel.findLevel(level, RatingConfig.getGlazeLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🍩 Глазурь-метр") - .withDescription(target.getAsMention()) - .addField("Глазурь", bar + "\n**" + level + "%** - " + rl.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(rl.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/GoonCommand.java b/src/main/java/creator/loki/feature/rating/commands/GoonCommand.java deleted file mode 100644 index c9654ca..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/GoonCommand.java +++ /dev/null @@ -1,67 +0,0 @@ -package creator.loki.feature.rating.commands; - -import java.awt.Color; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import net.dv8tion.jda.api.entities.Member; - -public class GoonCommand implements Command { - private final RatingService ratingService; - - @Inject - public GoonCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "goon"; - } - - @Override - public String getDescription() { - return "Гуон-детектор (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "goon [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "goon")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - int level = ratingService.getDeterministicValue(target.getId(), 444, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = level / 10; - for (int i = 0; i < filled; i++) bar.append("💀"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - Color color = - level >= 70 - ? new Color(180, 0, 0) - : level >= 40 ? new Color(128, 0, 128) : new Color(100, 100, 100); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("💀 Goon-детектор") - .withDescription(target.getAsMention()) - .addField("Уровень", bar + "\n**" + level + "%**", false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(color) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/IqCommand.java b/src/main/java/creator/loki/feature/rating/commands/IqCommand.java deleted file mode 100644 index b819152..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/IqCommand.java +++ /dev/null @@ -1,70 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class IqCommand implements Command { - - private final RatingService ratingService; - - @Inject - public IqCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "iq"; - } - - @Override - public String getDescription() { - return "Тест IQ (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "iq [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "iq")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int iq; - if (target.getUser().isBot()) { - iq = 9000; - } else if (target.getId().equals("1414975197269987471")) { - iq = 1000; - } else { - iq = ratingService.getDeterministicValue(target.getId(), 123, 0, 140); - } - - RatingLevel level = RatingConfig.findLevel(iq, "iq"); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🧠 Тест IQ") - .withDescription("Результат для " + target.getAsMention()) - .addField("IQ Уровень", "**" + iq + "** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Научно доказано вашим ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/LuckCommand.java b/src/main/java/creator/loki/feature/rating/commands/LuckCommand.java deleted file mode 100644 index 7556aeb..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/LuckCommand.java +++ /dev/null @@ -1,67 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class LuckCommand implements Command { - - private final RatingService ratingService; - - @Inject - public LuckCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "luck"; - } - - @Override - public String getDescription() { - return "Проверить свою удачу (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "luck [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "luck")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int luck = ratingService.getDeterministicValue(target.getId(), 777, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = luck / 10; - for (int i = 0; i < filled; i++) bar.append("🍀"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - - RatingLevel level = RatingLevel.findLevel(luck, RatingConfig.getLuckLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🍀 Удача") - .withDescription(target.getAsMention()) - .addField("Везение", bar + "\n**" + luck + "%** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java b/src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java deleted file mode 100644 index 7c00cc5..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java +++ /dev/null @@ -1,76 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class MustacheCommand implements Command { - - private final RatingService ratingService; - - @Inject - public MustacheCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "mustache"; - } - - @Override - public String getDescription() { - return "Проверка на усатость (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "mustache [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "mustache")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int mustacheLevel; - if (target.getUser().isBot() || target.getId().equals("1414975197269987471")) { - mustacheLevel = 0; - } else if (target.getId().equals("678283217094180915")) { - mustacheLevel = 1000; - } else { - mustacheLevel = ratingService.getDeterministicValue(target.getId(), 888, 0, 100); - } - - StringBuilder bar = new StringBuilder(); - int filled = Math.min(mustacheLevel / 10, 10); - for (int i = 0; i < filled; i++) bar.append("🧔"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - - RatingLevel level = RatingConfig.findLevel(mustacheLevel, "mustache"); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🧔 Mustache Метр") - .withDescription(target.getAsMention()) - .addField( - "Усатость", bar + "\n**" + mustacheLevel + "%** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/PpCommand.java b/src/main/java/creator/loki/feature/rating/commands/PpCommand.java deleted file mode 100644 index 6f8b93d..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/PpCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class PpCommand implements Command { - - private final RatingService ratingService; - - @Inject - public PpCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "pp"; - } - - @Override - public String getDescription() { - return "Измеритель pp (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "pp [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "pp")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - if (target.getUser().isBot()) { - context.getChannel().sendMessage("❌ У ботов нет pp!").queue(); - return; - } - - int size; - if (target.getId().equals("1414975197269987471")) { - size = 100; - } else { - size = ratingService.getDeterministicValue(target.getId(), 6969, 0, 30); - } - - StringBuilder ppVisual = new StringBuilder("8"); - for (int i = 0; i < size; i++) ppVisual.append("="); - ppVisual.append("D"); - - RatingLevel level = RatingConfig.findLevel(size, "pp"); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🍆 PP Размер") - .withDescription(target.getAsMention()) - .addField( - "Размер", - "```" + ppVisual + "```\n**" + size + " см** - " + level.getComment(), - false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/RateCommand.java b/src/main/java/creator/loki/feature/rating/commands/RateCommand.java deleted file mode 100644 index 2c4f504..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/RateCommand.java +++ /dev/null @@ -1,79 +0,0 @@ -package creator.loki.feature.rating.commands; - -import java.awt.Color; -import java.util.HashMap; -import java.util.Map; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import net.dv8tion.jda.api.entities.Member; - -public class RateCommand implements Command { - - private final RatingService ratingService; - - @Inject - public RateCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "rate"; - } - - @Override - public String getDescription() { - return "Оценить пользователя из 10 (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "rate [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "rate")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int rating = ratingService.getDeterministicValue(target.getId(), 420, 1, 10); - String stars = "⭐".repeat(rating) + "☆".repeat(10 - rating); - - Map comments = new HashMap<>(); - comments.put(10, "💯 ИДЕАЛЬНО!"); - comments.put(9, "🔥 Почти идеально!"); - comments.put(8, "😍 Отлично!"); - comments.put(7, "👍 Хорошо!"); - comments.put(6, "🙂 Неплохо"); - comments.put(5, "😐 Средне"); - comments.put(4, "😕 Ниже среднего"); - comments.put(3, "😬 Так себе"); - comments.put(2, "💀 Плохо"); - comments.put(1, "🗿 Ужасно"); - - String comment = comments.getOrDefault(rating, "🤔"); - Color color = rating >= 8 ? new Color(255, 215, 0) : new Color(52, 152, 219); - - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("⭐ Оценка") - .withDescription(target.getAsMention()) - .addField("Рейтинг", stars + "\n**" + rating + "/10** - " + comment, false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(color) - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/RizzCommand.java b/src/main/java/creator/loki/feature/rating/commands/RizzCommand.java deleted file mode 100644 index 691ed52..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/RizzCommand.java +++ /dev/null @@ -1,67 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class RizzCommand implements Command { - - private final RatingService ratingService; - - @Inject - public RizzCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "rizz"; - } - - @Override - public String getDescription() { - return "На сколько у тебя ризз (харизма)"; - } - - @Override - public String getUsage() { - return "rizz [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "rizz")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - - int rizz = ratingService.getDeterministicValue(target.getId(), 555, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = rizz / 10; - for (int i = 0; i < filled; i++) bar.append("🗿"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - - RatingLevel level = RatingLevel.findLevel(rizz, RatingConfig.getRizzLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🗿 Rizz Метр") - .withDescription(target.getAsMention()) - .addField("Харизма", bar + "\n**" + rizz + "%** - " + level.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(level.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/SimpCommand.java b/src/main/java/creator/loki/feature/rating/commands/SimpCommand.java deleted file mode 100644 index a12bfaa..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/SimpCommand.java +++ /dev/null @@ -1,64 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class SimpCommand implements Command { - private final RatingService ratingService; - - @Inject - public SimpCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "simp"; - } - - @Override - public String getDescription() { - return "Симп-детектор (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "simp [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "simp")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - int level = ratingService.getDeterministicValue(target.getId(), 111, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = level / 10; - for (int i = 0; i < filled; i++) bar.append("💀"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - RatingLevel rl = RatingLevel.findLevel(level, RatingConfig.getSimpLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("😭 Симп-детектор") - .withDescription(target.getAsMention()) - .addField("Уровень", bar + "\n**" + level + "%** - " + rl.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(rl.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/rating/commands/VibeCommand.java b/src/main/java/creator/loki/feature/rating/commands/VibeCommand.java deleted file mode 100644 index b958ee8..0000000 --- a/src/main/java/creator/loki/feature/rating/commands/VibeCommand.java +++ /dev/null @@ -1,64 +0,0 @@ -package creator.loki.feature.rating.commands; - -import com.google.inject.Inject; -import creator.loki.command.Command; -import creator.loki.command.CommandContext; -import creator.loki.embed.EmbedFactory; -import creator.loki.feature.entertainment.service.RatingService; -import creator.loki.feature.rating.config.RatingConfig; -import creator.loki.feature.rating.config.RatingLevel; -import net.dv8tion.jda.api.entities.Member; - -public class VibeCommand implements Command { - private final RatingService ratingService; - - @Inject - public VibeCommand(RatingService ratingService) { - this.ratingService = ratingService; - } - - @Override - public String getName() { - return "vibe"; - } - - @Override - public String getDescription() { - return "Проверить свой вайб (результат всегда одинаковый)"; - } - - @Override - public String getUsage() { - return "vibe [@user]"; - } - - @Override - public String getCategory() { - return "Развлечения"; - } - - @Override - public void execute(CommandContext context) { - if (!ratingService.checkAndApplyCooldown(context, "vibe")) return; - Member target = ratingService.resolveTarget(context); - if (target == null) return; - int level = ratingService.getDeterministicValue(target.getId(), 222, 0, 100); - StringBuilder bar = new StringBuilder(); - int filled = level / 10; - for (int i = 0; i < filled; i++) bar.append("🎵"); - for (int i = filled; i < 10; i++) bar.append("⬜"); - RatingLevel rl = RatingLevel.findLevel(level, RatingConfig.getVibeLevels()); - context - .getChannel() - .sendMessageEmbeds( - EmbedFactory.create() - .withTitle("🎵 Вайб-чек") - .withDescription(target.getAsMention()) - .addField("Вайб", bar + "\n**" + level + "%** - " + rl.getComment(), false) - .withThumbnail(target.getUser().getAvatarUrl()) - .withColor(rl.getColor()) - .withFooter("💡 Детерминировано вашим Discord ID") - .build()) - .queue(); - } -} diff --git a/src/main/java/creator/loki/feature/reactroles/commands/ReactionRoleCommand.java b/src/main/java/creator/loki/feature/reactroles/commands/ReactionRoleCommand.java index 587347f..43b978a 100644 --- a/src/main/java/creator/loki/feature/reactroles/commands/ReactionRoleCommand.java +++ b/src/main/java/creator/loki/feature/reactroles/commands/ReactionRoleCommand.java @@ -10,6 +10,7 @@ import creator.loki.embed.EmbedTemplates; import net.dv8tion.jda.api.Permission; import creator.loki.feature.reactroles.repository.ReactionRoleRepository; import creator.loki.feature.reactroles.repository.ReactionRoleRepository; +import creator.loki.command.CommandCategories; public class ReactionRoleCommand implements Command { private final ReactionRoleRepository repository; @@ -36,7 +37,7 @@ public class ReactionRoleCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/reputation/MinusRepCommand.java b/src/main/java/creator/loki/feature/reputation/MinusRepCommand.java index 206a0aa..3814d66 100644 --- a/src/main/java/creator/loki/feature/reputation/MinusRepCommand.java +++ b/src/main/java/creator/loki/feature/reputation/MinusRepCommand.java @@ -9,6 +9,7 @@ import creator.loki.core.security.CooldownManager; import creator.loki.embed.EmbedFactory; import creator.loki.feature.reputation.repository.ReputationRepository; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class MinusRepCommand implements Command { private final ReputationRepository reputationRepository; @@ -37,7 +38,7 @@ public class MinusRepCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/reputation/RepCommand.java b/src/main/java/creator/loki/feature/reputation/RepCommand.java index 59711d6..0f505d1 100644 --- a/src/main/java/creator/loki/feature/reputation/RepCommand.java +++ b/src/main/java/creator/loki/feature/reputation/RepCommand.java @@ -9,6 +9,7 @@ import creator.loki.core.security.CooldownManager; import creator.loki.embed.EmbedFactory; import creator.loki.feature.reputation.repository.ReputationRepository; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class RepCommand implements Command { private final ReputationRepository reputationRepository; @@ -36,7 +37,7 @@ public class RepCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/reputation/RepTopCommand.java b/src/main/java/creator/loki/feature/reputation/RepTopCommand.java index a745beb..b499052 100644 --- a/src/main/java/creator/loki/feature/reputation/RepTopCommand.java +++ b/src/main/java/creator/loki/feature/reputation/RepTopCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.feature.reputation.repository.ReputationRepository; +import creator.loki.command.CommandCategories; /** Топ пользователей по репутации */ public class RepTopCommand implements Command { @@ -34,7 +35,7 @@ public class RepTopCommand implements Command { @Override public String getCategory() { - return "Статистика"; + return CommandCategories.STATISTICS; } @Override diff --git a/src/main/java/creator/loki/feature/roast/AgrCommand.java b/src/main/java/creator/loki/feature/roast/AgrCommand.java index b36de69..91f0f86 100644 --- a/src/main/java/creator/loki/feature/roast/AgrCommand.java +++ b/src/main/java/creator/loki/feature/roast/AgrCommand.java @@ -4,6 +4,7 @@ import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.config.BotConfig; import creator.loki.embed.EmbedTemplates; +import creator.loki.command.CommandCategories; public class AgrCommand implements Command { private final BotConfig config; @@ -35,7 +36,7 @@ public class AgrCommand implements Command { @Override public String getCategory() { - return "Супер-Админ"; + return CommandCategories.SUPER_ADMIN; } @Override diff --git a/src/main/java/creator/loki/feature/roast/DossierCommand.java b/src/main/java/creator/loki/feature/roast/DossierCommand.java index 642f2fb..375a6b6 100644 --- a/src/main/java/creator/loki/feature/roast/DossierCommand.java +++ b/src/main/java/creator/loki/feature/roast/DossierCommand.java @@ -4,6 +4,7 @@ import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.config.BotConfig; import creator.loki.embed.EmbedTemplates; +import creator.loki.command.CommandCategories; public class DossierCommand implements Command { private final BotConfig config; @@ -33,7 +34,7 @@ public class DossierCommand implements Command { @Override public String getCategory() { - return "Супер-Админ"; + return CommandCategories.SUPER_ADMIN; } @Override diff --git a/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java b/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java index e3fef81..b8e8552 100644 --- a/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java +++ b/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java @@ -10,6 +10,7 @@ import creator.loki.feature.role.validation.RoleCommandValidator; import creator.loki.feature.role.validation.RoleValidators; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class CreateRoleCommand implements Command { private final CustomRoleManager roleManager; @@ -35,7 +36,7 @@ public class CreateRoleCommand implements Command { @Override public String getCategory() { - return "Роли"; + return CommandCategories.ROLES; } @Override diff --git a/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java b/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java index f94ef1f..c762414 100644 --- a/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java +++ b/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java @@ -9,6 +9,7 @@ import creator.loki.feature.role.CustomRoleManager; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class DeleteRoleCommand implements Command { private final CustomRoleManager roleManager; @@ -34,7 +35,7 @@ public class DeleteRoleCommand implements Command { @Override public String getCategory() { - return "Роли"; + return CommandCategories.ROLES; } @Override diff --git a/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java b/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java index ea88ec3..880a809 100644 --- a/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java +++ b/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java @@ -11,6 +11,7 @@ import creator.loki.feature.role.CustomRoleManager; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class EditRoleCommand implements Command { private static final Pattern HEX_PATTERN = Pattern.compile("^#?[0-9A-Fa-f]{6}$"); @@ -37,7 +38,7 @@ public class EditRoleCommand implements Command { @Override public String getCategory() { - return "Роли"; + return CommandCategories.ROLES; } @Override diff --git a/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java b/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java index 97c2271..afa889f 100644 --- a/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java +++ b/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java @@ -11,6 +11,7 @@ import creator.loki.embed.EmbedTemplates; import creator.loki.feature.role.CustomRoleManager; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; +import creator.loki.command.CommandCategories; public class MyRolesCommand implements Command { private final CustomRoleManager roleManager; @@ -31,7 +32,7 @@ public class MyRolesCommand implements Command { @Override public String getCategory() { - return "Роли"; + return CommandCategories.ROLES; } @Override diff --git a/src/main/java/creator/loki/feature/ship/ShipCommand.java b/src/main/java/creator/loki/feature/ship/ShipCommand.java index da823e6..4f3d851 100644 --- a/src/main/java/creator/loki/feature/ship/ShipCommand.java +++ b/src/main/java/creator/loki/feature/ship/ShipCommand.java @@ -8,6 +8,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.feature.ship.repository.ShipPairRepository; import net.dv8tion.jda.api.entities.Member; +import creator.loki.command.CommandCategories; public class ShipCommand implements Command { private final ShipPairRepository shipPairRepository; @@ -33,7 +34,7 @@ public class ShipCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/ticket/commands/TicketSetupCommand.java b/src/main/java/creator/loki/feature/ticket/commands/TicketSetupCommand.java index 937dbd8..681b6bf 100644 --- a/src/main/java/creator/loki/feature/ticket/commands/TicketSetupCommand.java +++ b/src/main/java/creator/loki/feature/ticket/commands/TicketSetupCommand.java @@ -11,6 +11,7 @@ import net.dv8tion.jda.api.components.actionrow.ActionRow; import java.awt.Color; import creator.loki.feature.ticket.repository.TicketRepository; import creator.loki.feature.ticket.repository.TicketRepository; +import creator.loki.command.CommandCategories; public class TicketSetupCommand implements Command { private final TicketRepository ticketRepository; @@ -37,7 +38,7 @@ public class TicketSetupCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override diff --git a/src/main/java/creator/loki/feature/tiktok/TikTokCommand.java b/src/main/java/creator/loki/feature/tiktok/TikTokCommand.java index 3da5d23..9c0b5c5 100644 --- a/src/main/java/creator/loki/feature/tiktok/TikTokCommand.java +++ b/src/main/java/creator/loki/feature/tiktok/TikTokCommand.java @@ -17,6 +17,7 @@ import okhttp3.Request; import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import creator.loki.command.CommandCategories; public class TikTokCommand implements Command { private static final Logger logger = LoggerFactory.getLogger(TikTokCommand.class); @@ -52,7 +53,7 @@ public class TikTokCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/utility/TimerCommand.java b/src/main/java/creator/loki/feature/utility/TimerCommand.java index de88599..5729076 100644 --- a/src/main/java/creator/loki/feature/utility/TimerCommand.java +++ b/src/main/java/creator/loki/feature/utility/TimerCommand.java @@ -3,6 +3,7 @@ package creator.loki.feature.utility; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; +import creator.loki.command.CommandCategories; public class TimerCommand implements Command { @Override @@ -22,7 +23,7 @@ public class TimerCommand implements Command { @Override public String getCategory() { - return "Утилиты"; + return CommandCategories.UTILITY; } @Override diff --git a/src/main/java/creator/loki/feature/utility/commands/PollCommand.java b/src/main/java/creator/loki/feature/utility/commands/PollCommand.java index 60eae0d..e042d4b 100644 --- a/src/main/java/creator/loki/feature/utility/commands/PollCommand.java +++ b/src/main/java/creator/loki/feature/utility/commands/PollCommand.java @@ -7,6 +7,7 @@ import creator.loki.command.CommandContext; import creator.loki.embed.EmbedFactory; import creator.loki.embed.EmbedTemplates; import net.dv8tion.jda.api.entities.emoji.Emoji; +import creator.loki.command.CommandCategories; public class PollCommand implements Command { private static final String[] EMOJI_NUMBERS = { @@ -30,7 +31,7 @@ public class PollCommand implements Command { @Override public String getCategory() { - return "Развлечения"; + return CommandCategories.ENTERTAINMENT; } @Override diff --git a/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java b/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java index f2abbba..7b9d1c8 100644 --- a/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java +++ b/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java @@ -9,6 +9,7 @@ import creator.loki.embed.EmbedFactory; import creator.loki.feature.config.repository.ConfigRepository; import creator.loki.util.GuildChannelResolve; import net.dv8tion.jda.api.Permission; +import creator.loki.command.CommandCategories; public class VoiceSetupPrefixCommand implements Command { @@ -38,7 +39,7 @@ public class VoiceSetupPrefixCommand implements Command { @Override public String getCategory() { - return "Настройка"; + return CommandCategories.SETTINGS; } @Override