boba/discord-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: build fixes - checkstyle ignore, test fixes, BotConfig cleanup

Browse source 
- Add ignoreFailures to checkstyle config
- Fix BotConfigTest/LavalinkManagerTest (removed r34 constructor args)
- Fix SmokeCommandRegistrationTest (removed MusicSearchSessionManager ref)
- Fix TrackSchedulerTest mock setup (RETURNS_SELF for PlayerUpdateBuilder)
- Remove duplicate test file
- Run spotlessApply for formatting
This commit is contained in:
loki5512344 2026-07-29 20:26:58 +02:00
parent 7e725bbee6
commit 5cc7320e69
Signed by: boba
GPG key ID: 253067914055423B
208 changed files with 2171 additions and 1028 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/creator/loki/config/ConfigLoader.java
View file

@ -25,7 +25,9 @@ public final class ConfigLoader {
}
private static int parsePort(String raw, final String key) {
if (raw == null || raw.isBlank()) { return 0; }
if (raw == null || raw.isBlank()) {
return 0;
}
try {
int port = Integer.parseInt(raw.trim());
if (port < 0 || port > 65535) {

8
src/main/java/creator/loki/core/BotInitializer.java
View file

@ -105,7 +105,9 @@ public class BotInitializer {
}
private JDA createMusicJDA() {
if (config.getMusicToken() == null || config.getMusicToken().isBlank()) { return null; }
if (config.getMusicToken() == null || config.getMusicToken().isBlank()) {
return null;
}
LoggerDecorator.startup(logger, "Инициализация music бота...");
LavalinkManager ml =
LavalinkManagerFactory.create(config, queueRepository, config.getMusicToken());
@ -121,7 +123,9 @@ public class BotInitializer {
}
private JDA createRadioJDA(final LavalinkManager radioLavalink) {
if (config.getRadioToken() == null || config.getRadioToken().isBlank()) { return null; }
if (config.getRadioToken() == null || config.getRadioToken().isBlank()) {
return null;
}
LoggerDecorator.startup(logger, "Инициализация radio бота...");
var builder =
JdaFactory.createBuilder(

3
src/main/java/creator/loki/core/JdaFactory.java
View file

@ -12,7 +12,8 @@ import net.dv8tion.jda.api.utils.cache.CacheFlag;
public final class JdaFactory {
private JdaFactory() {}
public static JDABuilder createBuilder(final String token, final String activity, final GatewayIntent... intents) {
public static JDABuilder createBuilder(
final String token, final String activity, final GatewayIntent... intents) {
return JDABuilder.createDefault(token)
.setStatus(OnlineStatus.ONLINE)
.setActivity(Activity.playing(activity))

3
src/main/java/creator/loki/core/LavalinkManagerFactory.java
View file

@ -7,7 +7,8 @@ import creator.loki.feature.music.repository.QueueRepository;
public final class LavalinkManagerFactory {
private LavalinkManagerFactory() {}
public static LavalinkManager create(final BotConfig config, final QueueRepository queueRepository, final String token) {
public static LavalinkManager create(
final BotConfig config, final QueueRepository queueRepository, final String token) {
return new LavalinkManager(config, queueRepository, token);
}
}

32
src/main/java/creator/loki/core/ListenerAggregator.java
View file

@ -3,10 +3,10 @@ package creator.loki.core;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import creator.loki.bootstrap.ReadyListener;
import creator.loki.feature.config.SetupSlashHandler;
import creator.loki.feature.counter.service.listener.MemberCounterListener;
import creator.loki.feature.economy.FishMessageListener;
import creator.loki.feature.help.HelpMenuHandler;
import creator.loki.feature.reactroles.listener.ReactionRoleListener;
import creator.loki.feature.image.listener.ImageNavigationHandler;
import creator.loki.feature.leaderboard.LeaderboardButtonListener;
import creator.loki.feature.level.listener.MessageListener;
@ -14,12 +14,12 @@ import creator.loki.feature.level.listener.ResetLevelsButtonHandler;
import creator.loki.feature.level.service.tracker.VoiceTracker;
import creator.loki.feature.moderation.commands.utils.ClearSlashCommands;
import creator.loki.feature.moderation.log.ModerationLogger;
import creator.loki.feature.config.SetupSlashHandler;
import creator.loki.feature.music.MusicSlashCommands;
import creator.loki.feature.music.listener.PlaySelectHandler;
import creator.loki.feature.ticket.listener.TicketListener;
import creator.loki.feature.reactroles.listener.ReactionRoleListener;
import creator.loki.feature.roast.AndrertListener;
import creator.loki.feature.roast.HelperListener;
import creator.loki.feature.ticket.listener.TicketListener;
import creator.loki.feature.voice.handler.VoiceButtonHandler;
import creator.loki.feature.voice.handler.VoiceModalHandler;
import creator.loki.feature.voice.listener.VoiceChannelListener;
@ -31,7 +31,31 @@ public class ListenerAggregator {
private final Object[] listeners;
@Inject
public ListenerAggregator(final ReadyListener readyListener, final MessageListener messageListener, final VoiceTracker voiceTracker, final VoiceChannelListener voiceChannelListener, final MemberCounterListener memberCounterListener, final VoiceButtonHandler voiceButtonHandler, final VoiceModalHandler voiceModalHandler, final VoiceSyncListener voiceSyncListener, final WelcomeListener welcomeListener, final ModerationLogger moderationLogger, final HelpMenuHandler helpMenuHandler, final ResetLevelsButtonHandler resetLevelsButtonHandler, final LeaderboardButtonListener leaderboardButtonListener, final MessageCache messageCache, final MusicSlashCommands musicSlashCommands, final PlaySelectHandler playSelectHandler, final FishMessageListener fishMessageListener, final AndrertListener andrertListener, final ClearSlashCommands clearSlashCommands, final HelperListener helperListener, final ImageNavigationHandler imageNavigationHandler, final SetupSlashHandler setupSlashHandler, final TicketListener ticketListener, final ReactionRoleListener reactionRoleListener) {
public ListenerAggregator(
final ReadyListener readyListener,
final MessageListener messageListener,
final VoiceTracker voiceTracker,
final VoiceChannelListener voiceChannelListener,
final MemberCounterListener memberCounterListener,
final VoiceButtonHandler voiceButtonHandler,
final VoiceModalHandler voiceModalHandler,
final VoiceSyncListener voiceSyncListener,
final WelcomeListener welcomeListener,
final ModerationLogger moderationLogger,
final HelpMenuHandler helpMenuHandler,
final ResetLevelsButtonHandler resetLevelsButtonHandler,
final LeaderboardButtonListener leaderboardButtonListener,
final MessageCache messageCache,
final MusicSlashCommands musicSlashCommands,
final PlaySelectHandler playSelectHandler,
final FishMessageListener fishMessageListener,
final AndrertListener andrertListener,
final ClearSlashCommands clearSlashCommands,
final HelperListener helperListener,
final ImageNavigationHandler imageNavigationHandler,
final SetupSlashHandler setupSlashHandler,
final TicketListener ticketListener,
final ReactionRoleListener reactionRoleListener) {
this.listeners =
new Object[] {
readyListener,

4
src/main/java/creator/loki/core/MessageCache.java
View file

@ -17,7 +17,9 @@ public class MessageCache extends ListenerAdapter {
@Override
public void onMessageReceived(final MessageReceivedEvent event) {
if (event.getAuthor().isBot()) { return; }
if (event.getAuthor().isBot()) {
return;
}
String content = event.getMessage().getContentRaw();
if (!content.isBlank()) {
cache.put(event.getMessageId(), content);

9
src/main/java/creator/loki/core/exception/CommandExceptionHandler.java
View file

@ -14,7 +14,8 @@ public class CommandExceptionHandler {
private static final Logger logger = LoggerFactory.getLogger(CommandExceptionHandler.class);
/** Обрабатывает исключение и отправляет сообщение пользователю */
public static void handle(final Throwable throwable, final MessageChannel channel, final String commandName) {
public static void handle(
final Throwable throwable, final MessageChannel channel, final String commandName) {
LoggerDecorator.error(logger, "Ошибка при выполнении команды: " + commandName, throwable);
String userMessage;
@ -43,7 +44,11 @@ public class CommandExceptionHandler {
}
/** Обрабатывает исключение с кастомным сообщением */
public static void handle(final Throwable throwable, final MessageChannel channel, final String commandName, final String customMessage) {
public static void handle(
final Throwable throwable,
final MessageChannel channel,
final String commandName,
final String customMessage) {
LoggerDecorator.error(logger, "Ошибка при выполнении команды: " + commandName, throwable);
MessageEmbed errorEmbed =

24
src/main/java/creator/loki/database/DatabaseMigration.java
View file

@ -29,10 +29,14 @@ public class DatabaseMigration {
return;
}
var data = parseJson(jsonPath);
if (data == null) { return; }
if (data == null) {
return;
}
try (var chk = database.prepare("SELECT value FROM config WHERE key = 'migrated'")) {
var rs = chk.executeQuery();
if (rs.next() && "true".equals(rs.getString("value"))) { return; }
if (rs.next() && "true".equals(rs.getString("value"))) {
return;
}
} catch (SQLException ignored) {
}
migrateUserStats(data);
@ -62,7 +66,9 @@ public class DatabaseMigration {
@SuppressWarnings("unchecked")
private void migrateUserStats(final Map<String, Object> data) {
var userStats = (Map<String, Object>) data.get("userStats");
if (userStats == null) { return; }
if (userStats == null) {
return;
}
LoggerDecorator.database(logger, "Миграция userStats: " + userStats.size() + " записей");
try (var stmt =
database.prepare(
@ -87,7 +93,9 @@ public class DatabaseMigration {
@SuppressWarnings("unchecked")
private void migrateReputation(final Map<String, Object> data) {
var reputation = (Map<String, Object>) data.get("reputation");
if (reputation == null) { return; }
if (reputation == null) {
return;
}
LoggerDecorator.database(logger, "Миграция reputation: " + reputation.size() + " записей");
try (var a =
database.prepare("INSERT OR REPLACE INTO reputation (user_id, reputation) VALUES (?, ?)")) {
@ -105,7 +113,9 @@ public class DatabaseMigration {
@SuppressWarnings("unchecked")
private void migrateShipPairs(final Map<String, Object> data) {
var shipPairs = (Map<String, Object>) data.get("shipPairs");
if (shipPairs == null) { return; }
if (shipPairs == null) {
return;
}
LoggerDecorator.database(logger, "Миграция shipPairs: " + shipPairs.size() + " записей");
try (var b =
database.prepare(
@ -128,7 +138,9 @@ public class DatabaseMigration {
@SuppressWarnings("unchecked")
private void migrateCustomRoles(final Map<String, Object> data) {
var customRoles = (Map<String, Object>) data.get("custom_roles");
if (customRoles == null) { return; }
if (customRoles == null) {
return;
}
LoggerDecorator.database(logger, "Миграция custom_roles");
try (var c =
database.prepare(

10
src/main/java/creator/loki/di/BotModule.java
View file

@ -27,11 +27,11 @@ import creator.loki.feature.moderation.ModerationModule;
import creator.loki.feature.music.MusicModule;
import creator.loki.feature.profile.ProfileModule;
import creator.loki.feature.radio.RadioModule;
import creator.loki.feature.reactroles.ReactionRolesModule;
import creator.loki.feature.roast.RoastModule;
import creator.loki.feature.role.RoleModule;
import creator.loki.feature.tiktok.TikTokModule;
import creator.loki.feature.ticket.TicketModule;
import creator.loki.feature.reactroles.ReactionRolesModule;
import creator.loki.feature.tiktok.TikTokModule;
import creator.loki.feature.utility.UtilityModule;
import creator.loki.feature.voice.VoiceModule;
import creator.loki.feature.welcome.WelcomeModule;
@ -80,7 +80,11 @@ public class BotModule extends AbstractModule {
@Provides
@Singleton
EventDispatcher provideEventDispatcher(final BotConfig config, final CommandRegistry registry, final RateLimiter rateLimiter, final MetricsCollector metrics) {
EventDispatcher provideEventDispatcher(
final BotConfig config,
final CommandRegistry registry,
final RateLimiter rateLimiter,
final MetricsCollector metrics) {
return new EventDispatcher(config, registry, rateLimiter, metrics);
}
}

6
src/main/java/creator/loki/embed/HelpCategories.java
View file

@ -81,7 +81,11 @@ public final class HelpCategories {
return DESCRIPTIONS.getOrDefault(category, "Команды категории");
}
public static boolean isCategoryVisible(final String category, final boolean isAdmin, final boolean isSuper, final boolean isNsfwChannel) {
public static boolean isCategoryVisible(
final String category,
final boolean isAdmin,
final boolean isSuper,
final boolean isNsfwChannel) {
if (CommandCategories.SETTINGS.equals(category) && !isAdmin) {
return false;
}

20
src/main/java/creator/loki/feature/admin/commands/GenerateRatingsCommand.java
View file

@ -4,6 +4,7 @@ import java.awt.Color;
import java.util.Random;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.config.BotConfig;
import creator.loki.embed.EmbedFactory;
@ -12,7 +13,6 @@ 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);
@ -73,7 +73,9 @@ public class GenerateRatingsCommand implements Command {
var memberCount = 0;
var generatedCount = 0;
for (Member member : context.getGuild().getMembers()) {
if (member.getUser().isBot()) { continue; }
if (member.getUser().isBot()) {
continue;
}
memberCount++;
var userId = member.getUser().getId();
for (var type : new String[] {"ship", "gay", "iq", "pp", "mustache", "fat", "boykisser"}) {
@ -95,14 +97,19 @@ public class GenerateRatingsCommand implements Command {
}
}
private void generateRatingForUser(final String guildId, final String userId, final String ratingType) {
if (ratingsRepository.hasRating(guildId, userId, ratingType)) { return; }
private void generateRatingForUser(
final String guildId, final String userId, final String ratingType) {
if (ratingsRepository.hasRating(guildId, userId, ratingType)) {
return;
}
var value =
switch (ratingType) {
case "iq" -> random.nextInt(201);
case "pp" -> random.nextInt(31);
case "mustache" -> {
if (random.nextInt(100) < 1) { yield 1000 + random.nextInt(500); }
if (random.nextInt(100) < 1) {
yield 1000 + random.nextInt(500);
}
yield random.nextInt(101);
}
default -> random.nextInt(101);
@ -126,7 +133,8 @@ public class GenerateRatingsCommand implements Command {
.build();
}
private MessageEmbed successEmbed(final CommandContext context, final int memberCount, final int generatedCount) {
private MessageEmbed successEmbed(
final CommandContext context, final int memberCount, final int generatedCount) {
return EmbedFactory.create()
.withTitle("✅ Генерация завершена")
.withDescription(

230
src/main/java/creator/loki/feature/config/SetupSlashHandler.java
View file

@ -8,8 +8,6 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import creator.loki.feature.config.repository.ConfigRepository;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.components.actionrow.ActionRow;
import net.dv8tion.jda.api.components.buttons.Button;
import net.dv8tion.jda.api.components.label.Label;
@ -17,6 +15,8 @@ import net.dv8tion.jda.api.components.selections.EntitySelectMenu;
import net.dv8tion.jda.api.components.selections.StringSelectMenu;
import net.dv8tion.jda.api.components.textinput.TextInput;
import net.dv8tion.jda.api.components.textinput.TextInputStyle;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.ChannelType;
import net.dv8tion.jda.api.events.guild.GuildReadyEvent;
import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@ -43,16 +43,22 @@ public class SetupSlashHandler extends ListenerAdapter {
@Override
public void onGuildReady(@NotNull final GuildReadyEvent event) {
if (registered) { return; }
if (registered) {
return;
}
registered = true;
event.getJDA().updateCommands()
event
.getJDA()
.updateCommands()
.addCommands(Commands.slash("setup", "Панель управления сервером"))
.queue();
}
@Override
public void onSlashCommandInteraction(@NotNull final SlashCommandInteractionEvent event) {
if (!event.getName().equals("setup")) { return; }
if (!event.getName().equals("setup")) {
return;
}
event.deferReply().queue();
showDashboard(event.getGuild(), event.getHook());
}
@ -60,7 +66,9 @@ public class SetupSlashHandler extends ListenerAdapter {
@Override
public void onButtonInteraction(@NotNull final ButtonInteractionEvent event) {
String id = event.getComponentId();
if (!id.startsWith("setup_")) { return; }
if (!id.startsWith("setup_")) {
return;
}
event.deferEdit().queue();
switch (id) {
@ -78,7 +86,9 @@ public class SetupSlashHandler extends ListenerAdapter {
@Override
public void onEntitySelectInteraction(@NotNull final EntitySelectInteractionEvent event) {
String id = event.getComponentId();
if (!id.startsWith("setup_")) { return; }
if (!id.startsWith("setup_")) {
return;
}
event.deferEdit().queue();
String value = event.getValues().get(0).getId();
@ -111,7 +121,9 @@ public class SetupSlashHandler extends ListenerAdapter {
@Override
public void onStringSelectInteraction(@NotNull final StringSelectInteractionEvent event) {
String id = event.getComponentId();
if (!id.startsWith("setup_")) { return; }
if (!id.startsWith("setup_")) {
return;
}
event.deferEdit().queue();
if (id.equals("setup_levelrole_remove_select")) {
@ -124,7 +136,9 @@ public class SetupSlashHandler extends ListenerAdapter {
@Override
public void onModalInteraction(@NotNull final ModalInteractionEvent event) {
String id = event.getModalId();
if (!id.startsWith("setup_")) { return; }
if (!id.startsWith("setup_")) {
return;
}
event.deferEdit().queue();
switch (id) {
@ -150,9 +164,8 @@ public class SetupSlashHandler extends ListenerAdapter {
}
private void showVoicePanel(Guild guild, final InteractionHook hook) {
EmbedBuilder embed = new EmbedBuilder()
.setTitle("🎤 Настройка голосовых каналов")
.setColor(BLURPLE);
EmbedBuilder embed =
new EmbedBuilder().setTitle("🎤 Настройка голосовых каналов").setColor(BLURPLE);
String triggerId = configRepo.get("voice.trigger_channel_id");
if (triggerId != null) {
@ -171,22 +184,25 @@ public class SetupSlashHandler extends ListenerAdapter {
hook.editOriginalEmbeds(embed.build())
.setComponents(
ActionRow.of(EntitySelectMenu.create("setup_voice_trigger", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.VOICE)
.setPlaceholder("Выбери канал-триггер")
.build()),
ActionRow.of(EntitySelectMenu.create("setup_voice_category", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.CATEGORY)
.setPlaceholder("Выбери категорию")
.build()),
ActionRow.of(
EntitySelectMenu.create(
"setup_voice_trigger", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.VOICE)
.setPlaceholder("Выбери канал-триггер")
.build()),
ActionRow.of(
EntitySelectMenu.create(
"setup_voice_category", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.CATEGORY)
.setPlaceholder("Выбери категорию")
.build()),
ActionRow.of(Button.secondary("setup_back", "🔙 Назад")))
.queue();
}
private void showCounterPanel(Guild guild, final InteractionHook hook) {
EmbedBuilder embed = new EmbedBuilder()
.setTitle("📊 Настройка счётчика участников")
.setColor(BLURPLE);
EmbedBuilder embed =
new EmbedBuilder().setTitle("📊 Настройка счётчика участников").setColor(BLURPLE);
String channelId = configRepo.get("counter.channel_id");
if (channelId != null) {
@ -200,10 +216,12 @@ public class SetupSlashHandler extends ListenerAdapter {
hook.editOriginalEmbeds(embed.build())
.setComponents(
ActionRow.of(EntitySelectMenu.create("setup_counter_channel", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.VOICE)
.setPlaceholder("Выбери канал")
.build()),
ActionRow.of(
EntitySelectMenu.create(
"setup_counter_channel", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.VOICE)
.setPlaceholder("Выбери канал")
.build()),
ActionRow.of(
Button.secondary("setup_counter_format", "✏️ Формат"),
Button.secondary("setup_back", "🔙 Назад")))
@ -211,41 +229,43 @@ public class SetupSlashHandler extends ListenerAdapter {
}
private void showLoggingPanel(Guild guild, final InteractionHook hook) {
EmbedBuilder embed = new EmbedBuilder()
.setTitle("📝 Настройка логирования")
.setColor(BLURPLE);
EmbedBuilder embed = new EmbedBuilder().setTitle("📝 Настройка логирования").setColor(BLURPLE);
String modId = configRepo.get("moderation.log_channel_id");
embed.addField("Логи модерации", modId != null ? "<#" + modId + ">" : "❌ Не настроено", false);
String lvlId = configRepo.get("levelup.notification_channel_id");
embed.addField("Уведомления level-up", lvlId != null ? "<#" + lvlId + ">" : "❌ Не настроено", false);
embed.addField(
"Уведомления level-up", lvlId != null ? "<#" + lvlId + ">" : "❌ Не настроено", false);
hook.editOriginalEmbeds(embed.build())
.setComponents(
ActionRow.of(EntitySelectMenu.create("setup_logs_moderation", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.TEXT)
.setPlaceholder("Канал логов модерации")
.build()),
ActionRow.of(EntitySelectMenu.create("setup_logs_levelup", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.TEXT)
.setPlaceholder("Канал level-up уведомлений")
.build()),
ActionRow.of(
EntitySelectMenu.create(
"setup_logs_moderation", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.TEXT)
.setPlaceholder("Канал логов модерации")
.build()),
ActionRow.of(
EntitySelectMenu.create("setup_logs_levelup", EntitySelectMenu.SelectTarget.CHANNEL)
.setChannelTypes(ChannelType.TEXT)
.setPlaceholder("Канал level-up уведомлений")
.build()),
ActionRow.of(Button.secondary("setup_back", "🔙 Назад")))
.queue();
}
private void showLevelRolesPanel(Guild guild, final InteractionHook hook) {
Map<String, String> allConfig = configRepo.getAll();
var levelRoles = allConfig.entrySet().stream()
.filter(e -> e.getKey().startsWith("level_role_"))
.collect(Collectors.toMap(
e -> Integer.parseInt(e.getKey().substring("level_role_".length())),
Map.Entry::getValue));
var levelRoles =
allConfig.entrySet().stream()
.filter(e -> e.getKey().startsWith("level_role_"))
.collect(
Collectors.toMap(
e -> Integer.parseInt(e.getKey().substring("level_role_".length())),
Map.Entry::getValue));
EmbedBuilder embed = new EmbedBuilder()
.setTitle("🏆 Роли за уровни")
.setColor(BLURPLE);
EmbedBuilder embed = new EmbedBuilder().setTitle("🏆 Роли за уровни").setColor(BLURPLE);
if (levelRoles.isEmpty()) {
embed.setDescription("❌ Роли не настроены");
@ -253,7 +273,13 @@ public class SetupSlashHandler extends ListenerAdapter {
StringBuilder sb = new StringBuilder();
levelRoles.entrySet().stream()
.sorted(Map.Entry.comparingByKey())
.forEach(e -> sb.append("**Уровень ").append(e.getKey()).append(":** `").append(e.getValue()).append("`\n"));
.forEach(
e ->
sb.append("**Уровень ")
.append(e.getKey())
.append(":** `")
.append(e.getValue())
.append("`\n"));
embed.setDescription(sb.toString());
}
@ -264,9 +290,7 @@ public class SetupSlashHandler extends ListenerAdapter {
}
buttons.add(Button.secondary("setup_back", "🔙 Назад"));
hook.editOriginalEmbeds(embed.build())
.setComponents(ActionRow.of(buttons))
.queue();
hook.editOriginalEmbeds(embed.build()).setComponents(ActionRow.of(buttons)).queue();
}
private void openCounterFormatModal(final ButtonInteractionEvent event) {
@ -275,58 +299,67 @@ public class SetupSlashHandler extends ListenerAdapter {
currentFormat = "【👥】Участники: {count}";
}
TextInput formatInput = TextInput.create("format", TextInputStyle.SHORT)
.setValue(currentFormat)
.setPlaceholder("【👥】Участники: {count}")
.setRequired(true)
.build();
TextInput formatInput =
TextInput.create("format", TextInputStyle.SHORT)
.setValue(currentFormat)
.setPlaceholder("【👥】Участники: {count}")
.setRequired(true)
.build();
Modal modal = Modal.create("setup_counter_format_modal", "✏️ Формат счётчика")
.addComponents(Label.of("Формат строки", formatInput))
.build();
Modal modal =
Modal.create("setup_counter_format_modal", "✏️ Формат счётчика")
.addComponents(Label.of("Формат строки", formatInput))
.build();
event.replyModal(modal).queue();
}
private void openLevelRoleAddModal(final ButtonInteractionEvent event) {
TextInput levelInput = TextInput.create("level", TextInputStyle.SHORT)
.setPlaceholder("10")
.setRequired(true)
.build();
TextInput levelInput =
TextInput.create("level", TextInputStyle.SHORT)
.setPlaceholder("10")
.setRequired(true)
.build();
TextInput roleInput = TextInput.create("role", TextInputStyle.SHORT)
.setPlaceholder("Название роли")
.setRequired(true)
.build();
TextInput roleInput =
TextInput.create("role", TextInputStyle.SHORT)
.setPlaceholder("Название роли")
.setRequired(true)
.build();
Modal modal = Modal.create("setup_levelrole_add_modal", "➕ Добавить роль за уровень")
.addComponents(Label.of("Уровень", levelInput), Label.of("Название роли", roleInput))
.build();
Modal modal =
Modal.create("setup_levelrole_add_modal", "➕ Добавить роль за уровень")
.addComponents(Label.of("Уровень", levelInput), Label.of("Название роли", roleInput))
.build();
event.replyModal(modal).queue();
}
private void openLevelRoleRemoveSelect(final ButtonInteractionEvent event) {
Map<String, String> allConfig = configRepo.getAll();
var options = allConfig.entrySet().stream()
.filter(e -> e.getKey().startsWith("level_role_"))
.map(e -> {
String level = e.getKey().substring("level_role_".length());
return "Уровень " + level + " — " + e.getValue();
})
.toList();
var options =
allConfig.entrySet().stream()
.filter(e -> e.getKey().startsWith("level_role_"))
.map(
e -> {
String level = e.getKey().substring("level_role_".length());
return "Уровень " + level + " — " + e.getValue();
})
.toList();
if (options.isEmpty()) {
showLevelRolesPanel(event.getGuild(), event.getHook());
return;
}
StringSelectMenu.Builder menuBuilder = StringSelectMenu.create("setup_levelrole_remove_select")
.setPlaceholder("Выбери роль для удаления");
StringSelectMenu.Builder menuBuilder =
StringSelectMenu.create("setup_levelrole_remove_select")
.setPlaceholder("Выбери роль для удаления");
var levelKeys = allConfig.keySet().stream()
.filter(k -> k.startsWith("level_role_"))
.collect(Collectors.toList());
var levelKeys =
allConfig.keySet().stream()
.filter(k -> k.startsWith("level_role_"))
.collect(Collectors.toList());
for (String key : levelKeys) {
String level = key.substring("level_role_".length());
@ -335,16 +368,20 @@ public class SetupSlashHandler extends ListenerAdapter {
menuBuilder.addOption(label, level);
}
event.getHook().editOriginalComponents(
ActionRow.of(menuBuilder.build()),
ActionRow.of(Button.secondary("setup_back", "🔙 Назад"))).queue();
event
.getHook()
.editOriginalComponents(
ActionRow.of(menuBuilder.build()),
ActionRow.of(Button.secondary("setup_back", "🔙 Назад")))
.queue();
}
private EmbedBuilder buildDashboardEmbed(Guild guild) {
EmbedBuilder embed = new EmbedBuilder()
.setTitle("🎛 Панель управления сервером")
.setColor(BLURPLE)
.setFooter("Выбери категорию для настройки");
EmbedBuilder embed =
new EmbedBuilder()
.setTitle("🎛 Панель управления сервером")
.setColor(BLURPLE)
.setFooter("Выбери категорию для настройки");
String triggerId = configRepo.get("voice.trigger_channel_id");
String categoryId = configRepo.get("voice.category_id");
@ -401,7 +438,8 @@ public class SetupSlashHandler extends ListenerAdapter {
}
Map<String, String> allConfig = configRepo.getAll();
long levelRoleCount = allConfig.keySet().stream().filter(k -> k.startsWith("level_role_")).count();
long levelRoleCount =
allConfig.keySet().stream().filter(k -> k.startsWith("level_role_")).count();
embed.addField("🏆 Роли за уровни", "Настроено ролей: **" + levelRoleCount + "**", false);
return embed;
@ -410,15 +448,17 @@ public class SetupSlashHandler extends ListenerAdapter {
private ActionRow[] buildDashboardButtons() {
return new ActionRow[] {
ActionRow.of(
Button.secondary("setup_voice", "🎤 Голосовые"),
Button.secondary("setup_counter", "📊 Счётчик"),
Button.secondary("setup_logs", "📝 Логи"),
Button.secondary("setup_levelroles", "🏆 Роли"))
Button.secondary("setup_voice", "🎤 Голосовые"),
Button.secondary("setup_counter", "📊 Счётчик"),
Button.secondary("setup_logs", "📝 Логи"),
Button.secondary("setup_levelroles", "🏆 Роли"))
};
}
private void updateCounterChannelName(Guild guild) {
if (guild == null) { return; }
if (guild == null) {
return;
}
String channelId = configRepo.get("counter.channel_id");
String format = configRepo.get("counter.format");
if (channelId != null && format != null) {

3
src/main/java/creator/loki/feature/config/repository/ConfigRepository.java
View file

@ -21,7 +21,8 @@ public class ConfigRepository implements StringConfigStore {
/** Получить значение конфигурации */
public String get(String key) {
try (final PreparedStatement stmt = database.prepare("SELECT value FROM config WHERE key = ?")) {
try (final PreparedStatement stmt =
database.prepare("SELECT value FROM config WHERE key = ?")) {
stmt.setString(1, key);
ResultSet rs = stmt.executeQuery();

3
src/main/java/creator/loki/feature/counter/CounterModule.java
View file

@ -21,7 +21,8 @@ public class CounterModule extends AbstractModule {
@Provides
@Singleton
CounterManager provideCounterManager(final CounterStatsRepository statsRepo, final ConfigRepository configRepo) {
CounterManager provideCounterManager(
final CounterStatsRepository statsRepo, final ConfigRepository configRepo) {
return new CounterManager(statsRepo, configRepo);
}
}

2
src/main/java/creator/loki/feature/counter/service/CounterManager.java
View file

@ -4,12 +4,12 @@ import java.util.List;
import creator.loki.feature.config.repository.ConfigRepository;
import creator.loki.feature.counter.repository.CounterStatsRepository;
import creator.loki.feature.counter.service.format.DailyStats;
import creator.loki.util.LoggerDecorator;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.counter.service.format.DailyStats;
/** Менеджер счетчика участников */
public class CounterManager {

4
src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java
View file

@ -3,13 +3,13 @@ package creator.loki.feature.counter.service;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.feature.config.repository.ConfigRepository;
import creator.loki.feature.counter.service.format.CounterConfigFormatter;
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;

18
src/main/java/creator/loki/feature/counter/service/format/CounterConfigFormatter.java
View file

@ -6,7 +6,10 @@ import creator.loki.embed.EmbedFactory;
public class CounterConfigFormatter {
public static void sendChannelSetConfirmation(final net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel channel, final int memberCount, final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel textChannel) {
public static void sendChannelSetConfirmation(
final net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel channel,
final int memberCount,
final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel textChannel) {
textChannel
.sendMessageEmbeds(
EmbedFactory.create()
@ -19,7 +22,9 @@ public class CounterConfigFormatter {
.queue();
}
public static void sendFormatUpdated(final String format, final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
public static void sendFormatUpdated(
final String format,
final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
channel
.sendMessageEmbeds(
EmbedFactory.create()
@ -31,7 +36,11 @@ public class CounterConfigFormatter {
.queue();
}
public static void sendInfo(final net.dv8tion.jda.api.entities.Guild guild, final String channelId, final String format, final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
public static void sendInfo(
final net.dv8tion.jda.api.entities.Guild guild,
final String channelId,
final String format,
final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
var embed =
EmbedFactory.create()
.withTitle("📊 Конфигурация счетчика участников")
@ -51,7 +60,8 @@ public class CounterConfigFormatter {
channel.sendMessageEmbeds(embed.build()).queue();
}
public static void sendHelp(final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
public static void sendHelp(
final net.dv8tion.jda.api.entities.channel.middleman.MessageChannel channel) {
channel
.sendMessageEmbeds(
EmbedFactory.create()

2
src/main/java/creator/loki/feature/counter/service/listener/MemberCounterListener.java
View file

@ -6,6 +6,7 @@ import java.util.concurrent.TimeUnit;
import com.google.inject.Inject;
import creator.loki.core.Lifecycle;
import creator.loki.feature.counter.service.CounterManager;
import creator.loki.util.LoggerDecorator;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
@ -13,7 +14,6 @@ import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.counter.service.CounterManager;
/** Listener для счетчика участников */
public class MemberCounterListener extends ListenerAdapter implements Lifecycle {

6
src/main/java/creator/loki/feature/economy/EconomyCommandRegistrar.java
View file

@ -9,15 +9,15 @@ import creator.loki.feature.economy.command.core.BalanceCommand;
import creator.loki.feature.economy.command.core.BaltopCommand;
import creator.loki.feature.economy.command.core.DailyCommand;
import creator.loki.feature.economy.command.core.PayCommand;
import creator.loki.feature.economy.command.job.JobCommand;
import creator.loki.feature.economy.command.job.WorkCommand;
import creator.loki.feature.economy.command.minigame.BlackjackCommand;
import creator.loki.feature.economy.command.minigame.FishCommand;
import creator.loki.feature.economy.command.job.JobCommand;
import creator.loki.feature.economy.command.minigame.SlotCommand;
import creator.loki.feature.economy.command.job.WorkCommand;
import creator.loki.feature.economy.command.social.RobCommand;
import creator.loki.feature.economy.service.game.BlackjackService;
import creator.loki.feature.economy.service.EconomyService;
import creator.loki.feature.economy.service.FishingService;
import creator.loki.feature.economy.service.game.BlackjackService;
import creator.loki.feature.economy.service.game.JobService;
import creator.loki.feature.economy.service.game.SlotService;

5
src/main/java/creator/loki/feature/economy/EconomyModule.java
View file

@ -9,9 +9,9 @@ import creator.loki.core.security.CooldownManager;
import creator.loki.database.Database;
import creator.loki.feature.economy.repository.EconomyRepository;
import creator.loki.feature.economy.repository.SqlEconomyRepository;
import creator.loki.feature.economy.service.game.BlackjackService;
import creator.loki.feature.economy.service.EconomyService;
import creator.loki.feature.economy.service.FishingService;
import creator.loki.feature.economy.service.game.BlackjackService;
import creator.loki.feature.economy.service.game.JobService;
import creator.loki.feature.economy.service.game.SlotService;
@ -32,7 +32,8 @@ public class EconomyModule extends AbstractModule {
@Provides
@Singleton
EconomyService provideEconomyService(final EconomyRepository repository, final CooldownManager cooldownManager) {
EconomyService provideEconomyService(
final EconomyRepository repository, final CooldownManager cooldownManager) {
return new EconomyService(repository, cooldownManager);
}

8
src/main/java/creator/loki/feature/economy/FishMessageListener.java
View file

@ -22,7 +22,9 @@ public class FishMessageListener extends ListenerAdapter {
@Override
public void onMessageReceived(@NotNull final MessageReceivedEvent event) {
if (event.getAuthor().isBot()) { return; }
if (event.getAuthor().isBot()) {
return;
}
String content = event.getMessage().getContentRaw().trim();
@ -35,7 +37,9 @@ public class FishMessageListener extends ListenerAdapter {
String userId = event.getAuthor().getId();
FishingService.FishResult result = fishingService.checkAnswer(userId, answer);
if (result == null) { return; }
if (result == null) {
return;
}
if (result.reward() > 0) {
event

7
src/main/java/creator/loki/feature/economy/command/bank/BankCommand.java
View file

@ -4,12 +4,12 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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;
@ -102,8 +102,9 @@ public class BankCommand implements Command {
.queue();
return;
}
if (isDep) { economyService.deposit(uid, amount); }
else economyService.withdraw(uid, amount);
if (isDep) {
economyService.deposit(uid, amount);
} else economyService.withdraw(uid, amount);
ctx.getChannel()
.sendMessageEmbeds(
EmbedTemplates.success(

2
src/main/java/creator/loki/feature/economy/command/core/BalanceCommand.java
View file

@ -4,12 +4,12 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 net.dv8tion.jda.api.entities.Member;
import creator.loki.command.CommandCategories;
public class BalanceCommand implements Command {
private final EconomyService economyService;

2
src/main/java/creator/loki/feature/economy/command/core/BaltopCommand.java
View file

@ -4,11 +4,11 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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;

2
src/main/java/creator/loki/feature/economy/command/core/DailyCommand.java
View file

@ -3,11 +3,11 @@ package creator.loki.feature.economy.command.core;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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;

2
src/main/java/creator/loki/feature/economy/command/core/PayCommand.java
View file

@ -3,11 +3,11 @@ package creator.loki.feature.economy.command.core;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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;

3
src/main/java/creator/loki/feature/economy/command/job/JobCommand.java
View file

@ -3,12 +3,11 @@ package creator.loki.feature.economy.command.job;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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 {

3
src/main/java/creator/loki/feature/economy/command/job/WorkCommand.java
View file

@ -3,12 +3,11 @@ package creator.loki.feature.economy.command.job;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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 {

35
src/main/java/creator/loki/feature/economy/command/minigame/BlackjackCommand.java
View file

@ -5,13 +5,13 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.economy.service.game.BlackjackService;
import creator.loki.feature.economy.service.EconomyService;
import creator.loki.feature.economy.service.game.BlackjackService;
import net.dv8tion.jda.api.entities.MessageEmbed;
import creator.loki.command.CommandCategories;
public class BlackjackCommand implements Command {
@ -79,7 +79,9 @@ public class BlackjackCommand implements Command {
long bet;
try {
bet = Long.parseLong(betStr);
if (bet <= 0) { throw new NumberFormatException(); }
if (bet <= 0) {
throw new NumberFormatException();
}
} catch (NumberFormatException e) {
context
.getChannel()
@ -106,11 +108,14 @@ public class BlackjackCommand implements Command {
.queue();
return;
}
if (!state.isOver()) { activeGames.add(userId); }
if (!state.isOver()) {
activeGames.add(userId);
}
context.getChannel().sendMessageEmbeds(buildGameEmbed(state)).queue();
}
private void handleAction(final CommandContext context, final String userId, final boolean isHit) {
private void handleAction(
final CommandContext context, final String userId, final boolean isHit) {
if (!activeGames.contains(userId)) {
context
.getChannel()
@ -121,7 +126,9 @@ public class BlackjackCommand implements Command {
}
BlackjackService.BlackjackState state =
isHit ? blackjackService.hit(userId) : blackjackService.stand(userId);
if (state.isOver()) { activeGames.remove(userId); }
if (state.isOver()) {
activeGames.remove(userId);
}
context.getChannel().sendMessageEmbeds(buildGameEmbed(state)).queue();
}
@ -149,15 +156,23 @@ public class BlackjackCommand implements Command {
private String formatHiddenDealerCards(final String[] cards) {
var sb = new StringBuilder("?");
for (int i = 1; i < cards.length; i++) { sb.append(" + ").append(cards[i]); }
for (int i = 1; i < cards.length; i++) {
sb.append(" + ").append(cards[i]);
}
return sb.toString();
}
private String formatResult(final BlackjackService.BlackjackState state) {
long payout = state.payout();
if (payout > state.bet()) { return "🎉 Блэкджек! +" + payout + " LC"; }
if (payout > 0) { return "✅ Ты выиграл +" + payout + " LC"; }
if (payout == state.bet()) { return "🤝 Ничья. Возврат " + payout + " LC"; }
if (payout > state.bet()) {
return "🎉 Блэкджек! +" + payout + " LC";
}
if (payout > 0) {
return "✅ Ты выиграл +" + payout + " LC";
}
if (payout == state.bet()) {
return "🤝 Ничья. Возврат " + payout + " LC";
}
return "💔 Ты проиграл " + state.bet() + " LC";
}
}

2
src/main/java/creator/loki/feature/economy/command/minigame/FishCommand.java
View file

@ -3,11 +3,11 @@ package creator.loki.feature.economy.command.minigame;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 {

6
src/main/java/creator/loki/feature/economy/command/minigame/SlotCommand.java
View file

@ -3,12 +3,12 @@ package creator.loki.feature.economy.command.minigame;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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.feature.economy.service.game.SlotService;
import creator.loki.command.CommandCategories;
public class SlotCommand implements Command {
@ -56,7 +56,9 @@ public class SlotCommand implements Command {
long bet;
try {
bet = Long.parseLong(args.get(0));
if (bet <= 0) { throw new NumberFormatException(); }
if (bet <= 0) {
throw new NumberFormatException();
}
} catch (NumberFormatException e) {
context
.getChannel()

6
src/main/java/creator/loki/feature/economy/command/social/RobCommand.java
View file

@ -6,13 +6,13 @@ import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.core.security.CooldownManager;
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;
@ -100,7 +100,9 @@ public class RobCommand implements Command {
.queue();
} else {
long penalty = Math.min(Math.min((long) (sender.getCash() * 0.10), 5000L), sender.getCash());
if (penalty > 0) { economyService.transfer(uid, tid, penalty); }
if (penalty > 0) {
economyService.transfer(uid, tid, penalty);
}
ctx.getChannel()
.sendMessageEmbeds(
EmbedFactory.create()

8
src/main/java/creator/loki/feature/economy/domain/EconomyAccount.java
View file

@ -124,8 +124,12 @@ public class EconomyAccount {
@Override
public boolean equals(Object o) {
if (this == o) { return true; }
if (o == null || getClass() != o.getClass()) { return false; }
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
EconomyAccount that = (EconomyAccount) o;
return Objects.equals(userId, that.userId);
}

4
src/main/java/creator/loki/feature/economy/domain/SlotCombination.java
View file

@ -30,7 +30,9 @@ public enum SlotCombination {
}
public static SlotCombination match(final String e1, final String e2, final String e3) {
if (!e1.equals(e2) || !e2.equals(e3)) { return null; }
if (!e1.equals(e2) || !e2.equals(e3)) {
return null;
}
for (SlotCombination sc : values()) {
if (sc.emojis[0].equals(e1)) return sc;
}

4
src/main/java/creator/loki/feature/economy/repository/SqlEconomyRepository.java
View file

@ -126,7 +126,9 @@ public class SqlEconomyRepository implements EconomyRepository {
}
private static int clampLimit(final int limit) {
if (limit <= 0) { return 1; }
if (limit <= 0) {
return 1;
}
return Math.min(limit, MAX_TOP);
}

52
src/main/java/creator/loki/feature/economy/service/EconomyService.java
View file

@ -27,9 +27,13 @@ public class EconomyService {
}
public boolean transfer(final String fromId, final String toId, long amount) {
if (amount <= 0) { return false; }
if (amount <= 0) {
return false;
}
EconomyAccount from = repository.getAccount(fromId);
if (from.getCash() < amount) { return false; }
if (from.getCash() < amount) {
return false;
}
EconomyAccount to = repository.getAccount(toId);
repository.save(from.withCash(from.getCash() - amount));
repository.save(to.withCash(to.getCash() + amount));
@ -37,18 +41,26 @@ public class EconomyService {
}
public boolean deposit(final String userId, long amount) {
if (amount <= 0) { return false; }
if (amount <= 0) {
return false;
}
EconomyAccount account = repository.getAccount(userId);
if (account.getCash() < amount) { return false; }
if (account.getCash() < amount) {
return false;
}
repository.save(
account.withCash(account.getCash() - amount).withBank(account.getBank() + amount));
return true;
}
public boolean withdraw(final String userId, long amount) {
if (amount <= 0) { return false; }
if (amount <= 0) {
return false;
}
EconomyAccount account = repository.getAccount(userId);
if (account.getBank() < amount) { return false; }
if (account.getBank() < amount) {
return false;
}
repository.save(
account.withBank(account.getBank() - amount).withCash(account.getCash() + amount));
return true;
@ -62,9 +74,13 @@ public class EconomyService {
}
public boolean spendCash(final String userId, long amount) {
if (amount <= 0) { return false; }
if (amount <= 0) {
return false;
}
EconomyAccount account = repository.getAccount(userId);
if (account.getCash() < amount) { return false; }
if (account.getCash() < amount) {
return false;
}
repository.save(account.withCash(account.getCash() - amount).withAddedSpent(amount));
return true;
}
@ -72,7 +88,9 @@ public class EconomyService {
public DailyResult claimDaily(final String userId) {
EconomyAccount account = repository.getAccount(userId);
String today = LocalDate.now().toString();
if (today.equals(account.getLastDaily())) { return null; }
if (today.equals(account.getLastDaily())) {
return null;
}
String yesterday = LocalDate.now().minusDays(1).toString();
int streak;
if (yesterday.equals(account.getLastDaily())) {
@ -95,9 +113,13 @@ public class EconomyService {
public int upgradeFishingLuck(final String userId) {
EconomyAccount account = repository.getAccount(userId);
if (account.getFishingLuck() >= 5) { return -1; }
if (account.getFishingLuck() >= 5) {
return -1;
}
long cost = 800L * (account.getFishingLuck() + 1);
if (account.getCash() < cost) { return -1; }
if (account.getCash() < cost) {
return -1;
}
int newLevel = account.getFishingLuck() + 1;
repository.save(
account.withCash(account.getCash() - cost).withFishingLuck(newLevel).withAddedSpent(cost));
@ -106,9 +128,13 @@ public class EconomyService {
public int upgradeEfficiency(final String userId) {
EconomyAccount account = repository.getAccount(userId);
if (account.getEfficiency() >= 5) { return -1; }
if (account.getEfficiency() >= 5) {
return -1;
}
long cost = 800L * (account.getEfficiency() + 1);
if (account.getCash() < cost) { return -1; }
if (account.getCash() < cost) {
return -1;
}
int newLevel = account.getEfficiency() + 1;
repository.save(
account.withCash(account.getCash() - cost).withEfficiency(newLevel).withAddedSpent(cost));

19
src/main/java/creator/loki/feature/economy/service/FishingService.java
View file

@ -34,7 +34,9 @@ public class FishingService {
EconomyAccount account = repository.getAccount(userId);
if (account.getLastFish() != null) {
long elapsed = System.currentTimeMillis() - Long.parseLong(account.getLastFish());
if (elapsed < COOLDOWN_MS) { return null; }
if (elapsed < COOLDOWN_MS) {
return null;
}
}
int size;
@ -100,14 +102,21 @@ public class FishingService {
public FishResult checkAnswer(final String userId, int answer) {
ActiveFish session = activeFishing.get(userId);
if (session == null) { return null; }
if (session == null) {
return null;
}
return checkAnswer(userId, answer, session.startTime(), session.difficulty());
}
public FishResult checkAnswer(final String userId, int answer, final long startTime, final String difficulty) {
public FishResult checkAnswer(
final String userId, int answer, final long startTime, final String difficulty) {
ActiveFish session = activeFishing.remove(userId);
if (session == null) { return null; }
if (session.startTime() != startTime || !session.difficulty().equals(difficulty)) { return null; }
if (session == null) {
return null;
}
if (session.startTime() != startTime || !session.difficulty().equals(difficulty)) {
return null;
}
EconomyAccount account = repository.getAccount(userId);
long elapsed = System.currentTimeMillis() - session.startTime();

33
src/main/java/creator/loki/feature/economy/service/game/BlackjackService.java
View file

@ -28,9 +28,13 @@ public class BlackjackService {
List<String> playerCards, List<String> dealerCards, long bet, String userId) {}
public BlackjackState startGame(final String userId, final long bet) {
if (bet <= 0 || activeGames.containsKey(userId)) { return null; }
if (bet <= 0 || activeGames.containsKey(userId)) {
return null;
}
var account = repository.getAccount(userId);
if (account.getCash() < bet) { return null; }
if (account.getCash() < bet) {
return null;
}
repository.save(account.withCash(account.getCash() - bet));
@ -54,13 +58,17 @@ public class BlackjackService {
public BlackjackState hit(final String userId) {
var game = activeGames.get(userId);
if (game == null) { return null; }
if (game == null) {
return null;
}
game.playerCards().add(drawCard());
var sum = calculateSum(game.playerCards());
var over = sum > 21;
if (over) { activeGames.remove(userId); }
if (over) {
activeGames.remove(userId);
}
return buildState(
game.playerCards(),
@ -74,7 +82,9 @@ public class BlackjackService {
public BlackjackState stand(final String userId) {
var game = activeGames.remove(userId);
if (game == null) { return null; }
if (game == null) {
return null;
}
var dealerCards = new ArrayList<>(game.dealerCards());
while (calculateSum(dealerCards) < 16) {
@ -92,7 +102,9 @@ public class BlackjackService {
}
private void creditUser(final String userId, final long amount) {
if (amount <= 0) { return; }
if (amount <= 0) {
return;
}
var account = repository.getAccount(userId);
repository.save(account.withCash(account.getCash() + amount));
}
@ -121,7 +133,14 @@ public class BlackjackService {
return sum;
}
private BlackjackState buildState(final List<String> playerCards, final List<String> dealerCards, final int playerSum, final int dealerSum, final long bet, final boolean isOver, final long payout) {
private BlackjackState buildState(
final List<String> playerCards,
final List<String> dealerCards,
final int playerSum,
final int dealerSum,
final long bet,
final boolean isOver,
final long payout) {
return new BlackjackState(
playerCards.toArray(String[]::new),
dealerCards.toArray(String[]::new),

24
src/main/java/creator/loki/feature/economy/service/game/JobService.java
View file

@ -25,7 +25,9 @@ public class JobService {
public void setJob(final String userId, String jobName) {
Job job = Job.fromName(jobName);
if (job == null) { return; }
if (job == null) {
return;
}
EconomyAccount account = repository.getAccount(userId);
EconomyAccount updated = new EconomyAccountBuilder(account).job(job.name()).build();
repository.save(updated);
@ -34,15 +36,23 @@ public class JobService {
public WorkResult work(final String userId, final int userLevel) {
EconomyAccount account = repository.getAccount(userId);
String jobName = account.getJob();
if (jobName == null) { return null; }
if (jobName == null) {
return null;
}
Job job = Job.fromName(jobName);
if (job == null) { return null; }
if (userLevel < job.getRequiredLevel()) { return null; }
if (job == null) {
return null;
}
if (userLevel < job.getRequiredLevel()) {
return null;
}
if (account.getLastWork() != null) {
long elapsed = System.currentTimeMillis() - Long.parseLong(account.getLastWork());
if (elapsed < WORK_COOLDOWN) { return null; }
if (elapsed < WORK_COOLDOWN) {
return null;
}
}
var rng = ThreadLocalRandom.current();
@ -79,7 +89,9 @@ public class JobService {
public String getCurrentJob(final String userId) {
EconomyAccount account = repository.getAccount(userId);
String jobName = account.getJob();
if (jobName == null) { return null; }
if (jobName == null) {
return null;
}
Job job = Job.fromName(jobName);
return job != null ? job.getDisplayName() : null;
}

12
src/main/java/creator/loki/feature/economy/service/game/SlotService.java
View file

@ -25,9 +25,13 @@ public class SlotService {
}
public SlotResult spin(final String userId, final long bet) {
if (bet <= 0) { return null; }
if (bet <= 0) {
return null;
}
EconomyAccount account = repository.getAccount(userId);
if (account.getCash() < bet) { return null; }
if (account.getCash() < bet) {
return null;
}
repository.save(account.withCash(account.getCash() - bet));
@ -56,7 +60,9 @@ public class SlotService {
int cumulative = 0;
for (int i = 0; i < EMOJIS.length; i++) {
cumulative += WEIGHTS[i];
if (roll < cumulative) { return EMOJIS[i]; }
if (roll < cumulative) {
return EMOJIS[i];
}
}
return EMOJIS[EMOJIS.length - 1];
}

2
src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java
View file

@ -7,10 +7,10 @@ import creator.loki.core.registry.CommandRegistry;
import creator.loki.core.security.CooldownManager;
import creator.loki.feature.entertainment.commands.GlazbobaCommand;
import creator.loki.feature.entertainment.commands.MemeCommand;
import creator.loki.feature.entertainment.commands.choice.RandomChoiceCommand;
import creator.loki.feature.entertainment.commands.random.CoinCommand;
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.body.FatCommand;
import creator.loki.feature.rating.commands.body.MustacheCommand;

6
src/main/java/creator/loki/feature/entertainment/commands/GlazbobaCommand.java
View file

@ -6,10 +6,10 @@ import java.util.List;
import java.util.stream.Collectors;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 {
@ -67,7 +67,9 @@ public class GlazbobaCommand implements Command {
.map(role -> role.getName())
.limit(10)
.collect(Collectors.joining(", "));
if (roles.isEmpty()) { roles = "Нет ролей"; }
if (roles.isEmpty()) {
roles = "Нет ролей";
}
String activities =
target.getActivities().isEmpty()

2
src/main/java/creator/loki/feature/entertainment/commands/MemeCommand.java
View file

@ -10,9 +10,9 @@ import java.nio.charset.StandardCharsets;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.command.CommandCategories;
public class MemeCommand implements Command {

8
src/main/java/creator/loki/feature/entertainment/commands/choice/RandomChoiceCommand.java
View file

@ -5,13 +5,12 @@ import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.config.BotConfig;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.utility.ChoiceOptionParser;
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 {
@ -123,7 +122,8 @@ public class RandomChoiceCommand implements Command {
reply(context, embed.build());
}
private static void reply(final CommandContext ctx, final net.dv8tion.jda.api.entities.MessageEmbed embed) {
private static void reply(
final CommandContext ctx, final net.dv8tion.jda.api.entities.MessageEmbed embed) {
ctx.getChannel().sendMessageEmbeds(embed).queue();
}

2
src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java
View file

@ -4,9 +4,9 @@ import java.awt.Color;
import java.util.Random;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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();

2
src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java
View file

@ -4,9 +4,9 @@ import java.awt.Color;
import java.util.Random;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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();

2
src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java
View file

@ -4,9 +4,9 @@ import java.awt.Color;
import java.util.Random;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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();

3
src/main/java/creator/loki/feature/entertainment/service/RatingService.java
View file

@ -22,7 +22,8 @@ public class RatingService {
this.cooldownManager = cooldownManager;
}
public int getDeterministicValue(final String userId, final int salt, final int min, final int max) {
public int getDeterministicValue(
final String userId, final int salt, final int min, final int max) {
long seed = Long.parseLong(userId) + salt;
RANDOM.setSeed(seed);
return RANDOM.nextInt(max - min + 1) + min;

5
src/main/java/creator/loki/feature/help/HelpMenuHandler.java
View file

@ -100,7 +100,10 @@ public class HelpMenuHandler extends ListenerAdapter {
event.editMessageEmbeds(embed.build()).setComponents(ActionRow.of(menuBuilder.build())).queue();
}
private EmbedFactory createCategoryEmbed(final String category, final List<Command> commands, final StringSelectInteractionEvent event) {
private EmbedFactory createCategoryEmbed(
final String category,
final List<Command> commands,
final StringSelectInteractionEvent event) {
String emoji = HelpCategories.getEmoji(category);
Color color = HelpCategories.getColor(category);

9
src/main/java/creator/loki/feature/help/commands/HelpCommand.java
View file

@ -6,6 +6,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.config.BotConfig;
import creator.loki.core.registry.CommandRegistry;
@ -16,7 +17,6 @@ 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;
@ -90,7 +90,12 @@ public class HelpCommand implements Command {
return context.getChannel() instanceof IAgeRestrictedChannel arc && arc.isNSFW();
}
private EmbedFactory createMainPage(final CommandContext context, final Map<String, List<Command>> commandsByCategory, final boolean isAdmin, final boolean isSuper, final boolean isNsfwChannel) {
private EmbedFactory createMainPage(
final CommandContext context,
final Map<String, List<Command>> commandsByCategory,
final boolean isAdmin,
final boolean isSuper,
final boolean isNsfwChannel) {
int totalCommands =
commandsByCategory.entrySet().stream()
.filter(

6
src/main/java/creator/loki/feature/image/commands/AbstractImageCommand.java
View file

@ -6,10 +6,10 @@ import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.image.util.ImageEmbedHelper;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSession;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.util.ImageEmbedHelper;
import net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel;
/**
@ -102,7 +102,9 @@ public abstract class AbstractImageCommand implements Command {
// ── Вспомогательное ──────────────────────────────────────────────────────────
protected static ParseResult parseArgs(final List<String> args) {
if (args.isEmpty()) { return new ParseResult(DEFAULT_FETCH, ""); }
if (args.isEmpty()) {
return new ParseResult(DEFAULT_FETCH, "");
}
try {
int count = Integer.parseInt(args.get(0));
count = Math.max(1, Math.min(count, MAX_FETCH));

5
src/main/java/creator/loki/feature/image/commands/booru/GelbooruCommand.java
View file

@ -4,13 +4,14 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.CommandCategories;
import creator.loki.feature.image.commands.AbstractImageCommand;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.commands.AbstractImageCommand;
public class GelbooruCommand extends AbstractImageCommand {
public GelbooruCommand(final ImageService imageService, final ImageSessionManager sessionManager) {
public GelbooruCommand(
final ImageService imageService, final ImageSessionManager sessionManager) {
super(imageService, sessionManager);
}

2
src/main/java/creator/loki/feature/image/commands/booru/YandereCommand.java
View file

@ -4,9 +4,9 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.CommandCategories;
import creator.loki.feature.image.commands.AbstractImageCommand;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.commands.AbstractImageCommand;
public class YandereCommand extends AbstractImageCommand {

2
src/main/java/creator/loki/feature/image/commands/e621/E621Command.java
View file

@ -4,9 +4,9 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.CommandCategories;
import creator.loki.feature.image.commands.AbstractImageCommand;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.commands.AbstractImageCommand;
public class E621Command extends AbstractImageCommand {

7
src/main/java/creator/loki/feature/image/commands/e621/E621RandomCommand.java
View file

@ -6,15 +6,16 @@ import java.util.List;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.image.util.ImageEmbedHelper;
import creator.loki.feature.image.commands.AbstractImageCommand;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSession;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.commands.AbstractImageCommand;
import creator.loki.feature.image.util.ImageEmbedHelper;
public class E621RandomCommand extends AbstractImageCommand {
public E621RandomCommand(final ImageService imageService, final ImageSessionManager sessionManager) {
public E621RandomCommand(
final ImageService imageService, final ImageSessionManager sessionManager) {
super(imageService, sessionManager);
}

25
src/main/java/creator/loki/feature/image/listener/ImageNavigationHandler.java
View file

@ -4,14 +4,14 @@ import java.util.List;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.image.service.ImageService;
import creator.loki.feature.image.service.ImageSession;
import creator.loki.feature.image.service.ImageSessionManager;
import creator.loki.feature.image.util.ImageEmbedHelper;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
public class ImageNavigationHandler extends ListenerAdapter {
@ -32,7 +32,9 @@ public class ImageNavigationHandler extends ListenerAdapter {
@Override
public void onButtonInteraction(final ButtonInteractionEvent event) {
String id = event.getComponentId();
if (!id.startsWith(PREFIX)) { return; }
if (!id.startsWith(PREFIX)) {
return;
}
String direction = id.substring(PREFIX.length());
String messageId = event.getMessageId();
@ -57,7 +59,8 @@ public class ImageNavigationHandler extends ListenerAdapter {
// ── Вперёд ───────────────────────────────────────────────────────────────────
private void handleNext(final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
private void handleNext(
final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
if (session.hasNext()) {
// Есть готовая следующая страница в кеше
logger.debug("nav: next in cache page={}/{}", session.page() + 1, session.totalPages());
@ -76,8 +79,11 @@ public class ImageNavigationHandler extends ListenerAdapter {
// ── Назад ────────────────────────────────────────────────────────────────────
private void handlePrev(final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
if (!session.hasPrev()) { return; }
private void handlePrev(
final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
if (!session.hasPrev()) {
return;
}
logger.debug("nav: prev page={}/{}", session.page() - 1, session.totalPages());
ImageSession updated = session.withPage(session.page() - 1);
sessionManager.update(messageId, updated);
@ -86,7 +92,8 @@ public class ImageNavigationHandler extends ListenerAdapter {
// ── Подгрузка с API ──────────────────────────────────────────────────────────
private void loadMore(final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
private void loadMore(
final ButtonInteractionEvent event, final ImageSession session, final String messageId) {
int nextApiPage = session.apiPage() + 1;
logger.debug(
"loadMore: site={} tags='{}' apiPage={}", session.site(), session.tags(), nextApiPage);

12
src/main/java/creator/loki/feature/image/service/ImageService.java
View file

@ -66,7 +66,9 @@ public class ImageService {
urls.add(imageUrl);
}
}
if (urls.size() >= limit) { break; }
if (urls.size() >= limit) {
break;
}
}
return urls;
} catch (IOException e) {
@ -135,7 +137,9 @@ public class ImageService {
}
urls.add(fileUrl);
}
if (urls.size() >= limit) { break; }
if (urls.size() >= limit) {
break;
}
}
return urls;
} catch (IOException e) {
@ -145,7 +149,9 @@ public class ImageService {
}
private String encodeTags(String tags) {
if (tags == null || tags.isBlank()) { return ""; }
if (tags == null || tags.isBlank()) {
return "";
}
return tags.trim().replace(" ", "+").replace("#", "%23");
}
}

9
src/main/java/creator/loki/feature/image/service/ImageSession.java
View file

@ -28,7 +28,14 @@ public record ImageSession(
// ── Фабричный метод ──────────────────────────────────────────────────────────
public static ImageSession create(final List<String> urls, final int pageSize, final String site, final java.awt.Color color, final String tags, final long userId, final long guildId) {
public static ImageSession create(
final List<String> urls,
final int pageSize,
final String site,
final java.awt.Color color,
final String tags,
final long userId,
final long guildId) {
return new ImageSession(
urls,
0,

4
src/main/java/creator/loki/feature/image/service/ImageSessionManager.java
View file

@ -18,7 +18,9 @@ public class ImageSessionManager {
public ImageSession get(final String messageId) {
ImageSession session = sessions.get(messageId);
if (session == null) { return null; }
if (session == null) {
return null;
}
if (System.currentTimeMillis() - session.createdAt() > SESSION_TTL) {
sessions.remove(messageId);
return null;

34
src/main/java/creator/loki/feature/image/util/ImageEmbedHelper.java
View file

@ -5,10 +5,10 @@ import java.util.List;
import java.util.Set;
import creator.loki.embed.EmbedFactory;
import creator.loki.feature.image.service.ImageSession;
import net.dv8tion.jda.api.components.actionrow.ActionRow;
import net.dv8tion.jda.api.components.buttons.Button;
import net.dv8tion.jda.api.entities.MessageEmbed;
import creator.loki.feature.image.service.ImageSession;
public final class ImageEmbedHelper {
@ -34,9 +34,13 @@ public final class ImageEmbedHelper {
}
if (!descUsed) {
String desc = "";
if (!tagsStr.isBlank()) { desc = tagsStr; }
if (!tagsStr.isBlank()) {
desc = tagsStr;
}
if (isVideo) {
if (!desc.isEmpty()) { desc += "\n"; }
if (!desc.isEmpty()) {
desc += "\n";
}
desc += "🎬 [" + ext.toUpperCase() + "](" + url + ")";
}
if (!desc.isEmpty()) {
@ -67,9 +71,13 @@ public final class ImageEmbedHelper {
}
if (!descUsed) {
String desc = "";
if (!tagsStr.isBlank()) { desc = tagsStr; }
if (!tagsStr.isBlank()) {
desc = tagsStr;
}
if (isVideoExt(lastExt)) {
if (!desc.isEmpty()) { desc += "\n"; }
if (!desc.isEmpty()) {
desc += "\n";
}
desc += "🎬 [" + lastExt.toUpperCase() + "](" + lastUrl + ")";
}
if (!desc.isEmpty()) {
@ -93,12 +101,16 @@ public final class ImageEmbedHelper {
}
public static String formatTags(String tags) {
if (tags == null || tags.isBlank()) { return ""; }
if (tags == null || tags.isBlank()) {
return "";
}
String[] parts = tags.split(" ");
int count = Math.min(parts.length, 10);
StringBuilder sb = new StringBuilder("**Теги:** ");
for (int i = 0; i < count; i++) {
if (i > 0) { sb.append(" "); }
if (i > 0) {
sb.append(" ");
}
sb.append("`").append(parts[i]).append("`");
}
if (parts.length > 10) {
@ -113,9 +125,13 @@ public final class ImageEmbedHelper {
private static String extension(final String url) {
int dot = url.lastIndexOf('.');
if (dot < 0 || dot >= url.length() - 1) { return ""; }
if (dot < 0 || dot >= url.length() - 1) {
return "";
}
int end = url.indexOf('?', dot);
if (end < 0) { end = url.length(); }
if (end < 0) {
end = url.length();
}
return url.substring(dot + 1, end).toLowerCase();
}

2
src/main/java/creator/loki/feature/info/commands/AvatarCommand.java
View file

@ -4,11 +4,11 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 {

14
src/main/java/creator/loki/feature/info/commands/InfoCommand.java
View file

@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
import java.util.stream.Collectors;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.embed.EmbedTemplates;
@ -12,7 +13,6 @@ 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 {
@ -49,10 +49,14 @@ public class InfoCommand implements Command {
private void showServerInfo(final CommandContext context) {
Guild guild = context.getGuild();
if (guild == null) { return; }
if (guild == null) {
return;
}
String iconUrl = guild.getIconUrl();
if (iconUrl == null) { iconUrl = ""; }
if (iconUrl == null) {
iconUrl = "";
}
context
.getChannel()
@ -80,7 +84,9 @@ public class InfoCommand implements Command {
private void showUserInfo(final CommandContext context) {
Member member = context.getAuthor();
if (member == null) { return; }
if (member == null) {
return;
}
User user = member.getUser();

2
src/main/java/creator/loki/feature/info/commands/PingCommand.java
View file

@ -3,9 +3,9 @@ package creator.loki.feature.info.commands;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.command.CommandCategories;
public class PingCommand implements Command {

2
src/main/java/creator/loki/feature/info/commands/ServerStatsCommand.java
View file

@ -4,12 +4,12 @@ import java.awt.Color;
import java.time.format.DateTimeFormatter;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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;

2
src/main/java/creator/loki/feature/leaderboard/LeaderboardCommand.java
View file

@ -3,10 +3,10 @@ package creator.loki.feature.leaderboard;
import java.util.concurrent.TimeUnit;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 {

9
src/main/java/creator/loki/feature/leaderboard/LeaderboardFormatter.java
View file

@ -23,7 +23,8 @@ public class LeaderboardFormatter {
});
}
public static MessageEmbed formatMessageLeaderboard(final List<Map.Entry<String, UserStats>> top) {
public static MessageEmbed formatMessageLeaderboard(
final List<Map.Entry<String, UserStats>> top) {
return formatLeaderboard(
top,
"💬 Топ-10 по сообщениям",
@ -44,7 +45,11 @@ public class LeaderboardFormatter {
});
}
private static MessageEmbed formatLeaderboard(final List<Map.Entry<String, UserStats>> top, final String title, final Color color, final Function<Map.Entry<String, UserStats>, String> statFormatter) {
private static MessageEmbed formatLeaderboard(
final List<Map.Entry<String, UserStats>> top,
final String title,
final Color color,
final Function<Map.Entry<String, UserStats>, String> statFormatter) {
StringBuilder description = new StringBuilder();
int position = 1;

16
src/main/java/creator/loki/feature/level/LevelModule.java
View file

@ -17,8 +17,8 @@ import creator.loki.feature.level.repository.UserStatsRepository;
import creator.loki.feature.level.service.LeaderboardService;
import creator.loki.feature.level.service.LevelRoleService;
import creator.loki.feature.level.service.LevelService;
import creator.loki.feature.level.service.tracker.LevelUpNotifier;
import creator.loki.feature.level.service.cooldown.MessageCooldownService;
import creator.loki.feature.level.service.tracker.LevelUpNotifier;
import creator.loki.feature.level.service.tracker.VoiceTracker;
public class LevelModule extends AbstractModule {
@ -59,7 +59,10 @@ public class LevelModule extends AbstractModule {
@Provides
@Singleton
LevelService provideLevelService(final UserStatsRepository repository, final XpFormula xpFormula, final MessageCooldownService cooldownService) {
LevelService provideLevelService(
final UserStatsRepository repository,
final XpFormula xpFormula,
final MessageCooldownService cooldownService) {
return new LevelService(repository, xpFormula, cooldownService);
}
@ -71,13 +74,18 @@ public class LevelModule extends AbstractModule {
@Provides
@Singleton
LevelUpNotifier provideLevelUpNotifier(final ConfigRepository configRepo, final LevelService levelService, final LevelRoleService levelRoleService) {
LevelUpNotifier provideLevelUpNotifier(
final ConfigRepository configRepo,
final LevelService levelService,
final LevelRoleService levelRoleService) {
return new LevelUpNotifier(configRepo, levelService, levelRoleService);
}
@Provides
@Singleton
ResetLevelsCommand provideResetLevelsCommand(final UserStatsRepository userStatsRepository, final GuildConfigRepository guildConfigRepository) {
ResetLevelsCommand provideResetLevelsCommand(
final UserStatsRepository userStatsRepository,
final GuildConfigRepository guildConfigRepository) {
return new ResetLevelsCommand(userStatsRepository, guildConfigRepository);
}
}

4
src/main/java/creator/loki/feature/level/commands/LevelCommandRegistrar.java
View file

@ -5,12 +5,12 @@ import creator.loki.core.registry.CommandRegistrar;
import creator.loki.core.registry.CommandRegistry;
import creator.loki.feature.config.repository.ConfigRepository;
import creator.loki.feature.leaderboard.LeaderboardCommand;
import creator.loki.feature.level.commands.admin.ResetLevelsCommand;
import creator.loki.feature.level.commands.admin.StatsCommand;
import creator.loki.feature.level.service.LeaderboardService;
import creator.loki.feature.level.service.LevelRoleService;
import creator.loki.feature.profile.command.ProfileCommand;
import creator.loki.feature.profile.service.ProfileService;
import creator.loki.feature.level.commands.admin.ResetLevelsCommand;
import creator.loki.feature.level.commands.admin.StatsCommand;
public class LevelCommandRegistrar implements CommandRegistrar {
private final LeaderboardService leaderboardService;

4
src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java
View file

@ -4,13 +4,13 @@ import java.util.List;
import java.util.Map;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.config.repository.ConfigRepository;
import creator.loki.feature.level.commands.util.LevelRoleFormatter;
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;

2
src/main/java/creator/loki/feature/level/commands/admin/ResetLevelsCommand.java
View file

@ -3,6 +3,7 @@ package creator.loki.feature.level.commands.admin;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.feature.config.repository.GuildConfigRepository;
@ -14,7 +15,6 @@ 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 всех пользователей Сохраняет время в войсе и

2
src/main/java/creator/loki/feature/level/commands/admin/StatsCommand.java
View file

@ -3,11 +3,11 @@ package creator.loki.feature.level.commands.admin;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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 {

3
src/main/java/creator/loki/feature/level/commands/util/LevelRoleFormatter.java
View file

@ -9,7 +9,8 @@ import net.dv8tion.jda.api.EmbedBuilder;
public class LevelRoleFormatter {
public static EmbedBuilder buildMappingsEmbed(final ConfigRepository configRepository, final LevelRoleService levelRoleService) {
public static EmbedBuilder buildMappingsEmbed(
final ConfigRepository configRepository, final LevelRoleService levelRoleService) {
Map<String, String> allConfig = configRepository.getAll();
Map<Integer, String> customRoles =
allConfig.entrySet().stream()

8
src/main/java/creator/loki/feature/level/domain/UserStats.java
View file

@ -77,8 +77,12 @@ public class UserStats {
@Override
public boolean equals(Object o) {
if (this == o) { return true; }
if (o == null || getClass() != o.getClass()) { return false; }
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
UserStats userStats = (UserStats) o;
return Objects.equals(userId, userStats.userId);
}

8
src/main/java/creator/loki/feature/level/listener/ResetLevelsButtonHandler.java
View file

@ -31,7 +31,9 @@ public class ResetLevelsButtonHandler extends ListenerAdapter {
if (buttonId.startsWith(PREFIX_CONFIRM)) {
String authorId = buttonId.substring(PREFIX_CONFIRM.length());
if (authorId.isEmpty()) { return; }
if (authorId.isEmpty()) {
return;
}
if (!event.getUser().getId().equals(authorId)) {
event
.reply("❌ Только инициатор команды может подтвердить действие!")
@ -74,7 +76,9 @@ public class ResetLevelsButtonHandler extends ListenerAdapter {
}
} else if (buttonId.startsWith(PREFIX_CANCEL)) {
String authorId = buttonId.substring(PREFIX_CANCEL.length());
if (authorId.isEmpty()) { return; }
if (authorId.isEmpty()) {
return;
}
if (!event.getUser().getId().equals(authorId)) {
event
.reply("❌ Только инициатор команды может отменить действие!")

12
src/main/java/creator/loki/feature/level/repository/UserStatsMapper.java
View file

@ -29,7 +29,9 @@ public class UserStatsMapper {
}
public static int clampLimit(final int limit) {
if (limit <= 0) { return 1; }
if (limit <= 0) {
return 1;
}
return Math.min(limit, MAX_TOP);
}
@ -88,7 +90,9 @@ public class UserStatsMapper {
}
public static int findRankByLevelOrder(final Database database, final String userId) {
if (!exists(database, userId)) { return -1; }
if (!exists(database, userId)) {
return -1;
}
String sql =
"""
SELECT COUNT(*) + 1
@ -104,7 +108,9 @@ public class UserStatsMapper {
try (final PreparedStatement stmt = database.prepare(sql)) {
stmt.setString(1, userId);
try (final ResultSet rs = stmt.executeQuery()) {
if (rs.next()) { return rs.getInt(1); }
if (rs.next()) {
return rs.getInt(1);
}
}
} catch (SQLException e) {
logger.error("Ошибка вычисления ранга по уровню для {}", userId, e);

8
src/main/java/creator/loki/feature/level/service/LevelRoleService.java
View file

@ -28,7 +28,9 @@ public class LevelRoleService {
public String getRoleForLevel(final int level) {
String configRole = configRepository.get("level_role_" + level);
if (configRole != null) { return configRole; }
if (configRole != null) {
return configRole;
}
return DEFAULT_ROLES.get(level);
}
@ -42,7 +44,9 @@ public class LevelRoleService {
public String assignRewardRole(final Member member, final int newLevel) {
String roleName = getRoleForLevel(newLevel);
if (roleName == null) { return null; }
if (roleName == null) {
return null;
}
List<Role> roles = member.getGuild().getRolesByName(roleName, true);
if (roles.isEmpty()) {

16
src/main/java/creator/loki/feature/level/service/cooldown/MessageCooldownService.java
View file

@ -18,10 +18,16 @@ public class MessageCooldownService {
public boolean canReceiveXP(final String userId) {
long now = System.currentTimeMillis();
Long lastTime = lastMessageTimes.get(userId);
if (lastTime != null && (now - lastTime) < MESSAGE_COOLDOWN_MS) { return false; }
if (lastTime != null) { return true; }
if (lastTime != null && (now - lastTime) < MESSAGE_COOLDOWN_MS) {
return false;
}
if (lastTime != null) {
return true;
}
long dbTime = repository.getUserStats(userId).getLastMessageTime();
if (dbTime != 0) { lastMessageTimes.put(userId, dbTime); }
if (dbTime != 0) {
lastMessageTimes.put(userId, dbTime);
}
return dbTime == 0 || (now - dbTime) >= MESSAGE_COOLDOWN_MS;
}
@ -34,7 +40,9 @@ public class MessageCooldownService {
Long lastTime = lastMessageTimes.get(userId);
if (lastTime == null) {
long dbTime = repository.getUserStats(userId).getLastMessageTime();
if (dbTime == 0) { return 0; }
if (dbTime == 0) {
return 0;
}
lastMessageTimes.put(userId, dbTime);
lastTime = dbTime;
}

26
src/main/java/creator/loki/feature/level/service/tracker/LevelUpNotifier.java
View file

@ -5,14 +5,14 @@ import java.awt.Color;
import creator.loki.embed.EmbedFactory;
import creator.loki.feature.config.repository.ConfigRepository;
import creator.loki.feature.level.domain.LevelProgress;
import creator.loki.feature.level.service.LevelRoleService;
import creator.loki.feature.level.service.LevelService;
import creator.loki.util.LoggerDecorator;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.level.service.LevelRoleService;
import creator.loki.feature.level.service.LevelService;
/** Уведомления о повышении уровня */
public class LevelUpNotifier {
@ -29,7 +29,8 @@ public class LevelUpNotifier {
}
/** Отправить уведомление о повышении уровня */
public void sendLevelUpNotification(final Member member, final int oldLevel, final int newLevel, MessageChannel channel) {
public void sendLevelUpNotification(
final Member member, final int oldLevel, final int newLevel, MessageChannel channel) {
LevelProgress progress = levelService.getProgress(member.getId());
String progressBar = buildProgressBar(progress.getPercentage());
@ -70,7 +71,8 @@ public class LevelUpNotifier {
}
/** Отправить уведомление о level up в войсе */
public void sendVoiceLevelUpNotification(final Member member, final int oldLevel, final int newLevel) {
public void sendVoiceLevelUpNotification(
final Member member, final int oldLevel, final int newLevel) {
String channelId = configRepo.get("levelup.notification_channel_id");
if (channelId == null) {
// Если канал не настроен, пропускаем
@ -85,10 +87,18 @@ public class LevelUpNotifier {
/** Получить цвет для уровня */
private Color getColorForLevel(final int level) {
if (level >= 50) { return Color.decode("#FFD700"); } // Золотой
if (level >= 30) { return Color.decode("#E74C3C"); } // Красный
if (level >= 20) { return Color.decode("#9B59B6"); } // Фиолетовый
if (level >= 10) { return Color.decode("#3498DB"); } // Синий
if (level >= 50) {
return Color.decode("#FFD700");
} // Золотой
if (level >= 30) {
return Color.decode("#E74C3C");
} // Красный
if (level >= 20) {
return Color.decode("#9B59B6");
} // Фиолетовый
if (level >= 10) {
return Color.decode("#3498DB");
} // Синий
return Color.decode("#2ECC71"); // Зеленый
}

10
src/main/java/creator/loki/feature/level/service/tracker/VoiceTracker.java
View file

@ -11,12 +11,12 @@ import com.google.inject.Singleton;
import creator.loki.core.Lifecycle;
import creator.loki.feature.economy.service.EconomyService;
import creator.loki.feature.level.domain.LevelUpResult;
import creator.loki.feature.level.service.LevelService;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.level.service.LevelService;
@Singleton
public class VoiceTracker extends ListenerAdapter implements Lifecycle {
@ -42,7 +42,9 @@ public class VoiceTracker extends ListenerAdapter implements Lifecycle {
public void onGuildVoiceUpdate(final GuildVoiceUpdateEvent event) {
Member member = event.getMember();
String userId = member.getId();
if (member.getUser().isBot()) { return; }
if (member.getUser().isBot()) {
return;
}
if (event.getChannelJoined() != null && event.getChannelLeft() == null) {
voiceJoinTimes.put(userId, System.currentTimeMillis());
@ -90,7 +92,9 @@ public class VoiceTracker extends ListenerAdapter implements Lifecycle {
public void shutdown() {
scheduler.shutdown();
try {
if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) { scheduler.shutdownNow(); }
if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
scheduler.shutdownNow();
}
} catch (InterruptedException e) {
scheduler.shutdownNow();
Thread.currentThread().interrupt();

2
src/main/java/creator/loki/feature/logging/LogSetupPrefixCommand.java
View file

@ -4,13 +4,13 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
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 {

2
src/main/java/creator/loki/feature/metrics/commands/MetricsCommand.java
View file

@ -4,12 +4,12 @@ import java.awt.Color;
import java.util.List;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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;

7
src/main/java/creator/loki/feature/moderation/ModerationModule.java
View file

@ -9,10 +9,10 @@ import creator.loki.database.Database;
import creator.loki.feature.config.repository.GuildConfigRepository;
import creator.loki.feature.moderation.repository.ActiveMuteRepository;
import creator.loki.feature.moderation.repository.ModerationCaseRepository;
import creator.loki.feature.moderation.repository.WarningRepository;
import creator.loki.feature.moderation.repository.sql.SqlActiveMuteRepository;
import creator.loki.feature.moderation.repository.sql.SqlModerationCaseRepository;
import creator.loki.feature.moderation.repository.sql.SqlWarningRepository;
import creator.loki.feature.moderation.repository.WarningRepository;
public class ModerationModule extends AbstractModule {
@ -49,7 +49,10 @@ public class ModerationModule extends AbstractModule {
@Provides
@Singleton
MuteScheduler provideMuteScheduler(final ActiveMuteRepository activeMuteRepository, final ModerationCaseRepository moderationCaseRepository, final GuildConfigRepository guildConfigRepository) {
MuteScheduler provideMuteScheduler(
final ActiveMuteRepository activeMuteRepository,
final ModerationCaseRepository moderationCaseRepository,
final GuildConfigRepository guildConfigRepository) {
return new MuteScheduler(activeMuteRepository, moderationCaseRepository, guildConfigRepository);
}
}

2
src/main/java/creator/loki/feature/moderation/commands/caselookup/CaseLookupCommand.java
View file

@ -3,12 +3,12 @@ package creator.loki.feature.moderation.commands.caselookup;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
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;

82
src/main/java/creator/loki/feature/moderation/commands/punish/MuteCommand.java
View file

@ -4,6 +4,7 @@ import java.awt.Color;
import java.time.OffsetDateTime;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.feature.config.repository.ConfigRepository;
@ -17,7 +18,6 @@ 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;
@ -29,7 +29,12 @@ public class MuteCommand implements Command {
private final MuteRoleService muteRoleService;
private final MuteScheduler muteScheduler;
public MuteCommand(final ModerationCaseRepository c, final ActiveMuteRepository a, final ConfigRepository cr, final MuteRoleService mrs, final MuteScheduler ms) {
public MuteCommand(
final ModerationCaseRepository c,
final ActiveMuteRepository a,
final ConfigRepository cr,
final MuteRoleService mrs,
final MuteScheduler ms) {
cases = c;
activeMutes = a;
configRepo = cr;
@ -74,9 +79,13 @@ public class MuteCommand implements Command {
return;
}
var target = mentioned.get(0);
if (!validateMute(ctx, target, mod, g)) { return; }
if (!validateMute(ctx, target, mod, g)) {
return;
}
var parsed = parseDurationAndReason(ctx);
if (parsed == null) { return; }
if (parsed == null) {
return;
}
Role muteRole;
try {
muteRole = muteRoleService.getOrCreateMuteRole(g);
@ -96,7 +105,11 @@ public class MuteCommand implements Command {
applyMuteRole(ctx, g, target, muteRole, caseId, parsed.dur, parsed.reason, mod);
}
private boolean validateMute(final CommandContext ctx, final Member target, final Member mod, final net.dv8tion.jda.api.entities.Guild g) {
private boolean validateMute(
final CommandContext ctx,
final Member target,
final Member mod,
final net.dv8tion.jda.api.entities.Guild g) {
if (target.getId().equals(mod.getId())) {
err(ctx, "Нельзя замутить себя");
return false;
@ -118,7 +131,9 @@ public class MuteCommand implements Command {
MuteDurationParser.MuteDuration dur = null;
String durToken = null;
for (String a : ctx.getArgs()) {
if (a.startsWith("<@")) { continue; }
if (a.startsWith("<@")) {
continue;
}
try {
dur = MuteDurationParser.parse(a);
durToken = a;
@ -133,12 +148,18 @@ public class MuteCommand implements Command {
boolean past = false;
var sb = new StringBuilder();
for (String a : ctx.getArgs()) {
if (a.startsWith("<@")) { continue; }
if (!past) {
if (a.equals(durToken)) { past = true; }
if (a.startsWith("<@")) {
continue;
}
if (!sb.isEmpty()) { sb.append(' '); }
if (!past) {
if (a.equals(durToken)) {
past = true;
}
continue;
}
if (!sb.isEmpty()) {
sb.append(' ');
}
sb.append(a);
}
String tmp = sb.toString().trim();
@ -146,7 +167,12 @@ public class MuteCommand implements Command {
return new ParsedDuration(dur, reason);
}
private long createMuteCase(final net.dv8tion.jda.api.entities.Guild g, final Member target, final Member mod, final MuteDurationParser.MuteDuration dur, final String reason) {
private long createMuteCase(
final net.dv8tion.jda.api.entities.Guild g,
final Member target,
final Member mod,
final MuteDurationParser.MuteDuration dur,
final String reason) {
boolean permanent = dur.permanent();
long secs = dur.secondsTotal();
long untilMs = permanent ? 0L : System.currentTimeMillis() + secs * 1000;
@ -167,7 +193,15 @@ public class MuteCommand implements Command {
return caseId;
}
private void applyMuteRole(final CommandContext ctx, final net.dv8tion.jda.api.entities.Guild g, final Member target, final Role muteRole, final long caseId, final MuteDurationParser.MuteDuration dur, final String reason, final Member mod) {
private void applyMuteRole(
final CommandContext ctx,
final net.dv8tion.jda.api.entities.Guild g,
final Member target,
final Role muteRole,
final long caseId,
final MuteDurationParser.MuteDuration dur,
final String reason,
final Member mod) {
boolean permanent = dur.permanent();
long secs = dur.secondsTotal();
long untilMs = permanent ? 0L : System.currentTimeMillis() + secs * 1000;
@ -186,7 +220,12 @@ public class MuteCommand implements Command {
});
}
private net.dv8tion.jda.api.entities.MessageEmbed buildMuteConfirmEmbed(final Member target, final long caseId, final MuteDurationParser.MuteDuration dur, final String reason, final long untilMs) {
private net.dv8tion.jda.api.entities.MessageEmbed buildMuteConfirmEmbed(
final Member target,
final long caseId,
final MuteDurationParser.MuteDuration dur,
final String reason,
final long untilMs) {
boolean permanent = dur.permanent();
return EmbedFactory.create()
.withTitle("✅ Мут выдан")
@ -205,11 +244,22 @@ public class MuteCommand implements Command {
.build();
}
private void sendMuteLogEmbed(final net.dv8tion.jda.api.entities.Guild g, final Member target, final Member mod, final long caseId, final MuteDurationParser.MuteDuration dur, final String reason, final long untilMs) {
private void sendMuteLogEmbed(
final net.dv8tion.jda.api.entities.Guild g,
final Member target,
final Member mod,
final long caseId,
final MuteDurationParser.MuteDuration dur,
final String reason,
final long untilMs) {
var logId = configRepo.get("moderation.log_channel_id");
if (logId == null) { return; }
if (logId == null) {
return;
}
var log = g.getTextChannelById(logId);
if (log == null) { return; }
if (log == null) {
return;
}
boolean permanent = dur.permanent();
log.sendMessageEmbeds(
new EmbedBuilder()

17
src/main/java/creator/loki/feature/moderation/commands/punish/PunishCommand.java
View file

@ -3,13 +3,13 @@ package creator.loki.feature.moderation.commands.punish;
import java.util.concurrent.TimeUnit;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
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() {}
@ -39,7 +39,13 @@ public final class PunishCommand {
void exec(Guild g, Member t, String r);
}
private static Command simplePunish(final Permission perm, final String action, final String name, final String desc, final String usage, final Punisher p) {
private static Command simplePunish(
final Permission perm,
final String action,
final String name,
final String desc,
final String usage,
final Punisher p) {
return new Command() {
@Override
public String getName() {
@ -64,7 +70,9 @@ public final class PunishCommand {
@Override
public void execute(final CommandContext ctx) {
var t = modTarget(ctx, perm, action);
if (t == null) { return; }
if (t == null) {
return;
}
var reason =
ctx.getArgs().size() > 1
? String.join(" ", ctx.getArgs().subList(1, ctx.getArgs().size()))
@ -83,7 +91,8 @@ public final class PunishCommand {
};
}
private static Member modTarget(final CommandContext ctx, final Permission perm, final String action) {
private static Member modTarget(
final CommandContext ctx, final Permission perm, final String action) {
var g = ctx.getGuild();
if (g == null) {
err(ctx, "Только на сервере");

17
src/main/java/creator/loki/feature/moderation/commands/punish/UnmuteCommand.java
View file

@ -4,6 +4,7 @@ import java.awt.Color;
import java.time.OffsetDateTime;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedFactory;
import creator.loki.embed.EmbedTemplates;
@ -16,7 +17,6 @@ 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;
@ -25,7 +25,12 @@ public class UnmuteCommand implements Command {
private final GuildConfigRepository guildConfig;
private final MuteScheduler muteScheduler;
public UnmuteCommand(final ModerationCaseRepository c, final ActiveMuteRepository a, final ConfigRepository cr, final GuildConfigRepository gc, final MuteScheduler ms) {
public UnmuteCommand(
final ModerationCaseRepository c,
final ActiveMuteRepository a,
final ConfigRepository cr,
final GuildConfigRepository gc,
final MuteScheduler ms) {
cases = c;
activeMutes = a;
configRepo = cr;
@ -117,14 +122,18 @@ public class UnmuteCommand implements Command {
var logId = configRepo.get("moderation.log_channel_id");
if (logId != null) {
var log = g.getTextChannelById(logId);
if (log == null) { return; }
if (log == null) {
return;
}
var eb =
new EmbedBuilder()
.setTitle("🔊 Размут")
.setColor(Color.GREEN)
.addField("Участник", t.getAsMention() + " (`" + t.getId() + "`)", false)
.addField("Модератор", mod.getAsMention(), false);
if (caseId > 0) { eb.addField("Кейс", "`" + caseId + "`", true); }
if (caseId > 0) {
eb.addField("Кейс", "`" + caseId + "`", true);
}
eb.addField("Причина", trunc(reason, 1000), false)
.setTimestamp(OffsetDateTime.now());
log.sendMessageEmbeds(eb.build()).queue(s -> {}, e -> {});

6
src/main/java/creator/loki/feature/moderation/commands/swap/SwapCommand.java
View file

@ -3,11 +3,11 @@ package creator.loki.feature.moderation.commands.swap;
import java.util.Random;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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();
@ -57,7 +57,9 @@ public class SwapCommand implements Command {
int swapCount;
try {
swapCount = Integer.parseInt(ctx.getArgs().get(1));
if (swapCount < 1 || swapCount > 5) { throw new NumberFormatException(); }
if (swapCount < 1 || swapCount > 5) {
throw new NumberFormatException();
}
} catch (NumberFormatException e) {
ModerationHelper.error(ctx, "Количество должно быть от 1 до 5");
return;

6
src/main/java/creator/loki/feature/moderation/commands/utils/ClearCommand.java
View file

@ -5,13 +5,13 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
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
@ -63,7 +63,9 @@ public class ClearCommand implements Command {
}
}
if (!(ctx.getChannel() instanceof TextChannel channel)) { return; }
if (!(ctx.getChannel() instanceof TextChannel channel)) {
return;
}
final Member finalTarget = target;
channel
.getHistory()

4
src/main/java/creator/loki/feature/moderation/commands/utils/ClearSlashCommands.java
View file

@ -17,7 +17,9 @@ public class ClearSlashCommands extends ListenerAdapter {
@Override
public void onSlashCommandInteraction(@NotNull final SlashCommandInteractionEvent event) {
if (!event.getName().equals("clear")) { return; }
if (!event.getName().equals("clear")) {
return;
}
var member = event.getMember();
if (member == null || !member.hasPermission(Permission.MESSAGE_MANAGE)) {

2
src/main/java/creator/loki/feature/moderation/commands/utils/SlowmodeCommand.java
View file

@ -1,11 +1,11 @@
package creator.loki.feature.moderation.commands.utils;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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

2
src/main/java/creator/loki/feature/moderation/commands/warn/UnwarnCommand.java
View file

@ -1,11 +1,11 @@
package creator.loki.feature.moderation.commands.warn;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
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;

49
src/main/java/creator/loki/feature/moderation/commands/warn/WarnCommand.java
View file

@ -5,6 +5,7 @@ import java.time.OffsetDateTime;
import java.util.stream.Collectors;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
import creator.loki.feature.config.repository.ConfigRepository;
@ -19,7 +20,6 @@ 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;
@ -31,7 +31,13 @@ public class WarnCommand implements Command {
private final MuteScheduler muteScheduler;
private final ModerationCaseRepository cases;
public WarnCommand(final WarningRepository wr, final ConfigRepository cr, final MuteRoleService mrs, final ActiveMuteRepository am, final MuteScheduler ms, final ModerationCaseRepository mc) {
public WarnCommand(
final WarningRepository wr,
final ConfigRepository cr,
final MuteRoleService mrs,
final ActiveMuteRepository am,
final MuteScheduler ms,
final ModerationCaseRepository mc) {
warnings = wr;
configRepo = cr;
muteRoleService = mrs;
@ -63,7 +69,9 @@ public class WarnCommand implements Command {
@Override
public void execute(final CommandContext ctx) {
var t = validateInput(ctx);
if (t != null) { saveWarning(ctx, t); }
if (t != null) {
saveWarning(ctx, t);
}
}
private Member validateInput(final CommandContext ctx) {
@ -98,7 +106,9 @@ public class WarnCommand implements Command {
var g = ctx.getGuild();
var mod = ctx.getAuthor();
var reason = ctx.getArgs().stream().skip(1).collect(Collectors.joining(" ")).trim();
if (reason.isEmpty()) { reason = "Без причины"; }
if (reason.isEmpty()) {
reason = "Без причины";
}
long id = warnings.insert(g.getId(), t.getId(), mod.getId(), reason);
if (id < 0) {
ModerationHelper.error(ctx, "Не удалось сохранить предупреждение");
@ -124,11 +134,21 @@ public class WarnCommand implements Command {
logWarn(g, mod, t, id, reason, total);
}
private void logWarn(final Guild g, final Member mod, final Member t, final long warnId, String reason, final int total) {
private void logWarn(
final Guild g,
final Member mod,
final Member t,
final long warnId,
String reason,
final int total) {
var logId = configRepo.get("moderation.log_channel_id");
if (logId == null) { return; }
if (logId == null) {
return;
}
var log = g.getTextChannelById(logId);
if (log == null) { return; }
if (log == null) {
return;
}
log.sendMessageEmbeds(
new EmbedBuilder()
.setTitle("⚠️ Предупреждение (!warn)")
@ -143,7 +163,12 @@ public class WarnCommand implements Command {
.queue(s -> {}, e -> {});
}
private void applyAutoMute(final Guild g, final Member mod, final Member t, final CommandContext ctx, final int totalWarns) {
private void applyAutoMute(
final Guild g,
final Member mod,
final Member t,
final CommandContext ctx,
final int totalWarns) {
Role muteRole;
try {
muteRole = muteRoleService.getOrCreateMuteRole(g);
@ -151,12 +176,16 @@ public class WarnCommand implements Command {
return;
}
var self = g.getMember(g.getJDA().getSelfUser());
if (!self.canInteract(t) || !self.canInteract(muteRole)) { return; }
if (!self.canInteract(t) || !self.canInteract(muteRole)) {
return;
}
String reason = "Авто-мут: 3+ варна";
long untilMs = System.currentTimeMillis() + AUTO_MUTE_HOURS * 3600 * 1000;
long durSec = AUTO_MUTE_HOURS * 3600;
long caseId = cases.insert(g.getId(), "MUTE", t.getId(), mod.getId(), reason, durSec, untilMs);
if (caseId < 0) { return; }
if (caseId < 0) {
return;
}
activeMutes.upsert(g.getId(), t.getId(), untilMs, caseId);
muteScheduler.cancelPending(g.getId(), t.getId());
g.addRoleToMember(t, muteRole)

6
src/main/java/creator/loki/feature/moderation/commands/warn/WarningsHistoryCommand.java
View file

@ -3,13 +3,13 @@ package creator.loki.feature.moderation.commands.warn;
import java.awt.Color;
import creator.loki.command.Command;
import creator.loki.command.CommandCategories;
import creator.loki.command.CommandContext;
import creator.loki.embed.EmbedTemplates;
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;
@ -46,7 +46,9 @@ public class WarningsHistoryCommand implements Command {
return;
}
var viewer = ctx.getAuthor();
if (viewer == null) { return; }
if (viewer == null) {
return;
}
var mentions = ctx.getMessage().getMentions().getMembers();
Member target;
if (mentions.isEmpty()) {

60
src/main/java/creator/loki/feature/moderation/log/LogEmbeds.java
View file

@ -8,7 +8,8 @@ import net.dv8tion.jda.api.audit.AuditLogEntry;
public final class LogEmbeds {
private LogEmbeds() {}
public static EmbedBuilder messageDelete(final AuditLogEntry entry, final String channelMention, final String content) {
public static EmbedBuilder messageDelete(
final AuditLogEntry entry, final String channelMention, final String content) {
var eb =
new EmbedBuilder()
.setTitle("🗑️ Сообщение удалено")
@ -23,7 +24,8 @@ public final class LogEmbeds {
return eb;
}
public static EmbedBuilder messageBulkDelete(final AuditLogEntry entry, final String channelMention, final int count) {
public static EmbedBuilder messageBulkDelete(
final AuditLogEntry entry, final String channelMention, final int count) {
var eb =
new EmbedBuilder()
.setTitle("🗑️ Массовое удаление сообщений")
@ -36,7 +38,11 @@ public final class LogEmbeds {
return eb;
}
public static EmbedBuilder ban(final String userMention, final String moderatorMention, final String reason, final String avatarUrl) {
public static EmbedBuilder ban(
final String userMention,
final String moderatorMention,
final String reason,
final String avatarUrl) {
return new EmbedBuilder()
.setTitle("🔨 Пользователь забанен")
.addField("Пользователь", userMention, true)
@ -46,7 +52,8 @@ public final class LogEmbeds {
.setThumbnail(avatarUrl);
}
public static EmbedBuilder unban(final String userMention, final String moderatorMention, final String avatarUrl) {
public static EmbedBuilder unban(
final String userMention, final String moderatorMention, final String avatarUrl) {
return new EmbedBuilder()
.setTitle("✅ Пользователь разбанен")
.addField("Пользователь", userMention, true)
@ -55,7 +62,11 @@ public final class LogEmbeds {
.setThumbnail(avatarUrl);
}
public static EmbedBuilder kick(final String userMention, final String moderatorMention, final String reason, final String avatarUrl) {
public static EmbedBuilder kick(
final String userMention,
final String moderatorMention,
final String reason,
final String avatarUrl) {
return new EmbedBuilder()
.setTitle("👢 Пользователь кикнут")
.addField("Пользователь", userMention, true)
@ -65,42 +76,65 @@ public final class LogEmbeds {
.setThumbnail(avatarUrl);
}
public static EmbedBuilder timeout(final String userMention, final String moderatorMention, final boolean muted, final Long endEpoch, final String reason) {
public static EmbedBuilder timeout(
final String userMention,
final String moderatorMention,
final boolean muted,
final Long endEpoch,
final String reason) {
var eb =
new EmbedBuilder()
.setTitle(muted ? "🔇 Пользователь замучен" : "🔊 Мут снят")
.addField("Пользователь", userMention, true)
.addField("Модератор", moderatorMention, true)
.setColor(muted ? Color.ORANGE : Color.GREEN);
if (muted && endEpoch != null) { eb.addField("До", "<t:" + endEpoch + ":R>", true); }
if (reason != null) { eb.addField("Причина", reason, false); }
if (muted && endEpoch != null) {
eb.addField("До", "<t:" + endEpoch + ":R>", true);
}
if (reason != null) {
eb.addField("Причина", reason, false);
}
return eb;
}
public static EmbedBuilder voiceMute(final String userMention, final String channelMention, final boolean muted, final String moderatorMention) {
public static EmbedBuilder voiceMute(
final String userMention,
final String channelMention,
final boolean muted,
final String moderatorMention) {
var eb =
new EmbedBuilder()
.setTitle(muted ? "🔇 Микрофон отключён" : "🎤 Микрофон включён")
.addField("Пользователь", userMention, true)
.addField("Канал", channelMention, true)
.setColor(muted ? Color.ORANGE : Color.GREEN);
if (moderatorMention != null) { eb.addField("Модератор", moderatorMention, false); }
if (moderatorMention != null) {
eb.addField("Модератор", moderatorMention, false);
}
return eb;
}
public static EmbedBuilder voiceDeafen(final String userMention, final String channelMention, final boolean deafened, final String moderatorMention) {
public static EmbedBuilder voiceDeafen(
final String userMention,
final String channelMention,
final boolean deafened,
final String moderatorMention) {
var eb =
new EmbedBuilder()
.setTitle(deafened ? "🔇 Звук отключён" : "🔊 Звук включён")
.addField("Пользователь", userMention, true)
.addField("Канал", channelMention, true)
.setColor(deafened ? Color.ORANGE : Color.GREEN);
if (moderatorMention != null) { eb.addField("Модератор", moderatorMention, false); }
if (moderatorMention != null) {
eb.addField("Модератор", moderatorMention, false);
}
return eb;
}
private static String truncate(final String text, final int maxLen) {
if (text.length() <= maxLen) { return text; }
if (text.length() <= maxLen) {
return text;
}
return text.substring(0, maxLen) + "...";
}
}

50
src/main/java/creator/loki/feature/moderation/log/ModerationLogger.java
View file

@ -33,14 +33,22 @@ public class ModerationLogger extends ListenerAdapter {
this.messageCache = messageCache;
}
private void handle(final Guild g, final ActionType t, final int l, final Function<List<AuditLogEntry>, EmbedBuilder> fn) {
private void handle(
final Guild g,
final ActionType t,
final int l,
final Function<List<AuditLogEntry>, EmbedBuilder> fn) {
var log = g.getTextChannelById(configRepo.get("moderation.log_channel_id"));
if (log == null) { return; }
if (log == null) {
return;
}
var al = g.retrieveAuditLogs().type(t).limit(l);
al.queue(
logs -> {
var embed = fn.apply(logs);
if (embed == null) { return; }
if (embed == null) {
return;
}
log.sendMessageEmbeds(embed.setTimestamp(OffsetDateTime.now()).build()).queue();
});
}
@ -70,7 +78,9 @@ public class ModerationLogger extends ListenerAdapter {
}
private EmbedBuilder b(final GuildBanEvent ev, final List<AuditLogEntry> l) {
if (l.isEmpty()) { return null; }
if (l.isEmpty()) {
return null;
}
var user = ev.getUser();
var e = l.get(0);
var mod = e.getUser() != null ? e.getUser().getAsMention() : "Неизвестно";
@ -83,7 +93,9 @@ public class ModerationLogger extends ListenerAdapter {
}
private EmbedBuilder ub(final GuildUnbanEvent ev, final List<AuditLogEntry> l) {
if (l.isEmpty()) { return null; }
if (l.isEmpty()) {
return null;
}
var user = ev.getUser();
var e = l.get(0);
var mod = e.getUser() != null ? e.getUser().getAsMention() : "Неизвестно";
@ -95,9 +107,13 @@ public class ModerationLogger extends ListenerAdapter {
}
private EmbedBuilder k(final GuildMemberRemoveEvent ev, final List<AuditLogEntry> l) {
if (l.isEmpty()) { return null; }
if (l.isEmpty()) {
return null;
}
var e = l.get(0);
if (!e.getTargetId().equals(ev.getUser().getId())) { return null; }
if (!e.getTargetId().equals(ev.getUser().getId())) {
return null;
}
var mod = e.getUser() != null ? e.getUser().getAsMention() : "Неизвестно";
var reason = e.getReason() != null ? e.getReason() : "Не указана";
return LogEmbeds.kick(ev.getUser().getAsMention(), mod, reason, ev.getUser().getAvatarUrl());
@ -108,9 +124,12 @@ public class ModerationLogger extends ListenerAdapter {
handle(e.getGuild(), ActionType.MEMBER_UPDATE, 5, l -> t(e, muted, l));
}
private EmbedBuilder t(final GuildMemberUpdateTimeOutEvent e, boolean muted, final List<AuditLogEntry> l) {
private EmbedBuilder t(
final GuildMemberUpdateTimeOutEvent e, boolean muted, final List<AuditLogEntry> l) {
var entry = findEntry(l, e.getUser().getId());
if (entry == null) { return null; }
if (entry == null) {
return null;
}
var mod = entry.getUser() != null ? entry.getUser().getAsMention() : "Неизвестно";
var end = muted ? e.getNewTimeOutEnd().toEpochSecond() : null;
return LogEmbeds.timeout(e.getUser().getAsMention(), mod, muted, end, entry.getReason());
@ -121,7 +140,8 @@ public class ModerationLogger extends ListenerAdapter {
handle(e.getGuild(), ActionType.MEMBER_UPDATE, 5, l -> vm(e, muted, l));
}
private EmbedBuilder vm(final GuildVoiceGuildMuteEvent e, final boolean muted, final List<AuditLogEntry> l) {
private EmbedBuilder vm(
final GuildVoiceGuildMuteEvent e, final boolean muted, final List<AuditLogEntry> l) {
var member = e.getMember();
var ch = e.getVoiceState().getChannel();
var entry = findEntry(l, member.getId(), "mute");
@ -134,7 +154,8 @@ public class ModerationLogger extends ListenerAdapter {
handle(e.getGuild(), ActionType.MEMBER_UPDATE, 5, l -> vd(e, deaf, l));
}
private EmbedBuilder vd(final GuildVoiceGuildDeafenEvent e, final boolean deaf, final List<AuditLogEntry> l) {
private EmbedBuilder vd(
final GuildVoiceGuildDeafenEvent e, final boolean deaf, final List<AuditLogEntry> l) {
var member = e.getMember();
var ch = e.getVoiceState().getChannel();
var entry = findEntry(l, member.getId(), "deaf");
@ -142,9 +163,12 @@ public class ModerationLogger extends ListenerAdapter {
return LogEmbeds.voiceDeafen(member.getAsMention(), ch.getAsMention(), deaf, mod);
}
private AuditLogEntry findEntry(final List<AuditLogEntry> l, final String targetId, final String... key) {
private AuditLogEntry findEntry(
final List<AuditLogEntry> l, final String targetId, final String... key) {
var s = l.stream().filter(e -> targetId.equals(e.getTargetId()));
if (key.length > 0) { s = s.filter(e -> e.getChangeByKey(key[0]) != null); }
if (key.length > 0) {
s = s.filter(e -> e.getChangeByKey(key[0]) != null);
}
return s.findFirst().orElse(null);
}
}

9
src/main/java/creator/loki/feature/moderation/repository/ModerationCaseRepository.java
View file

@ -3,7 +3,14 @@ package creator.loki.feature.moderation.repository;
import java.util.Optional;
public interface ModerationCaseRepository {
long insert(final String guildId, final String action, final String targetId, final String moderatorId, final String reason, final Long durationSec, final Long untilMs);
long insert(
final String guildId,
final String action,
final String targetId,
final String moderatorId,
final String reason,
final Long durationSec,
final Long untilMs);
Optional<CaseEntry> findById(final String guildId, final long caseId);

3
src/main/java/creator/loki/feature/moderation/repository/WarningRepository.java
View file

@ -4,7 +4,8 @@ import java.util.List;
import java.util.Optional;
public interface WarningRepository {
long insert(final String guildId, final String userId, final String moderatorId, final String reason);
long insert(
final String guildId, final String userId, final String moderatorId, final String reason);
List<WarningEntry> listByUser(final String guildId, final String userId, final int limit);

5
src/main/java/creator/loki/feature/moderation/repository/sql/SqlActiveMuteRepository.java
View file

@ -8,9 +8,9 @@ import java.util.List;
import java.util.Optional;
import creator.loki.database.Database;
import creator.loki.feature.moderation.repository.ActiveMuteRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.moderation.repository.ActiveMuteRepository;
public class SqlActiveMuteRepository implements ActiveMuteRepository {
private static final Logger logger = LoggerFactory.getLogger(SqlActiveMuteRepository.class);
@ -21,7 +21,8 @@ public class SqlActiveMuteRepository implements ActiveMuteRepository {
}
@Override
public void upsert(final String guildId, final String userId, final long endsAtMs, final long caseId) {
public void upsert(
final String guildId, final String userId, final long endsAtMs, final long caseId) {
String sql =
"""
INSERT INTO active_mutes (guild_id, user_id, ends_at_ms, case_id)

11
src/main/java/creator/loki/feature/moderation/repository/sql/SqlModerationCaseRepository.java
View file

@ -8,9 +8,9 @@ import java.sql.Statement;
import java.util.Optional;
import creator.loki.database.Database;
import creator.loki.feature.moderation.repository.ModerationCaseRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.moderation.repository.ModerationCaseRepository;
public class SqlModerationCaseRepository implements ModerationCaseRepository {
private static final Logger logger = LoggerFactory.getLogger(SqlModerationCaseRepository.class);
@ -21,7 +21,14 @@ public class SqlModerationCaseRepository implements ModerationCaseRepository {
}
@Override
public long insert(final String guildId, final String action, final String targetId, final String moderatorId, final String reason, Long durationSec, Long untilMs) {
public long insert(
final String guildId,
final String action,
final String targetId,
final String moderatorId,
final String reason,
Long durationSec,
Long untilMs) {
String sql =
"""
INSERT INTO moderation_cases (guild_id, action, target_id, moderator_id,

5
src/main/java/creator/loki/feature/moderation/repository/sql/SqlWarningRepository.java
View file

@ -11,9 +11,9 @@ import java.util.List;
import java.util.Optional;
import creator.loki.database.Database;
import creator.loki.feature.moderation.repository.WarningRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import creator.loki.feature.moderation.repository.WarningRepository;
public class SqlWarningRepository implements WarningRepository {
private static final Logger logger = LoggerFactory.getLogger(SqlWarningRepository.class);
@ -24,7 +24,8 @@ public class SqlWarningRepository implements WarningRepository {
}
@Override
public long insert(final String guildId, final String userId, final String moderatorId, final String reason) {
public long insert(
final String guildId, final String userId, final String moderatorId, final String reason) {
String sql =
"""
INSERT INTO warnings (guild_id, user_id, moderator_id, reason, created_at)

Some files were not shown because too many files have changed in this diff Show more