From 6bbb58de060ae8d63c99da90178f794f80fd8499 Mon Sep 17 00:00:00 2001 From: Suraj Kumar Date: Wed, 24 Jun 2026 09:36:16 +0100 Subject: [PATCH 1/3] chore: update channel used in `ThisIsScamCommand` to `modmail` instead of `mod-audit-logs` --- .../tjbot/features/moderation/ThisIsScamCommand.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java index 00598c2895..268722c7fb 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java @@ -66,7 +66,7 @@ public final class ThisIsScamCommand extends BotCommandAdapter implements Messag private final Config config; private final ModerationActionsStore actionsStore; - private final Predicate isModAuditLogChannel; + private final Predicate isModMailChannel; private final Cache reportedMessageToTimestamp = Caffeine.newBuilder().maximumSize(10_000).expireAfterWrite(Duration.ofDays(1)).build(); @@ -86,8 +86,7 @@ public ThisIsScamCommand(Config config, ModerationActionsStore actionsStore) { this.config = Objects.requireNonNull(config); this.actionsStore = Objects.requireNonNull(actionsStore); - isModAuditLogChannel = - Pattern.compile(config.getModAuditLogChannelPattern()).asMatchPredicate(); + isModMailChannel = Pattern.compile(config.getModMailChannelPattern()).asMatchPredicate(); } @Override @@ -152,8 +151,7 @@ private boolean handleWasAlreadyReportedMessage(MessageContextInteractionEvent e private Optional findModAuditLogChannel(MessageContextInteractionEvent event) { Guild guild = Objects.requireNonNull(event.getGuild()); - Optional modAuditLogChannel = - Guilds.findTextChannel(guild, isModAuditLogChannel); + Optional modAuditLogChannel = Guilds.findTextChannel(guild, isModMailChannel); if (modAuditLogChannel.isEmpty()) { logger.warn( "Cannot find the designated mod audit log channel in guild '{}' with the pattern '{}'", From 3146400df0f7273b96f253e340f61094d4a7f8eb Mon Sep 17 00:00:00 2001 From: Suraj Kumar Date: Wed, 24 Jun 2026 09:37:58 +0100 Subject: [PATCH 2/3] chore: rename var to match modmail --- .../tjbot/features/moderation/ThisIsScamCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java index 268722c7fb..be551750bf 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java @@ -151,13 +151,13 @@ private boolean handleWasAlreadyReportedMessage(MessageContextInteractionEvent e private Optional findModAuditLogChannel(MessageContextInteractionEvent event) { Guild guild = Objects.requireNonNull(event.getGuild()); - Optional modAuditLogChannel = Guilds.findTextChannel(guild, isModMailChannel); - if (modAuditLogChannel.isEmpty()) { + Optional modMailChannel = Guilds.findTextChannel(guild, isModMailChannel); + if (modMailChannel.isEmpty()) { logger.warn( "Cannot find the designated mod audit log channel in guild '{}' with the pattern '{}'", guild.getId(), config.getModAuditLogChannelPattern()); } - return modAuditLogChannel; + return modMailChannel; } private MessageCreateAction reportToMods(Message message, TextChannel auditChannel) { From 8847744ef43cdecc1cf3ee249941e00e3ce0e0c7 Mon Sep 17 00:00:00 2001 From: Suraj Kumar Date: Wed, 24 Jun 2026 09:38:28 +0100 Subject: [PATCH 3/3] chore: rename method name to match modmail --- .../tjbot/features/moderation/ThisIsScamCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java index be551750bf..3180b61c57 100644 --- a/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java +++ b/application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java @@ -98,7 +98,7 @@ public void onMessageContext(MessageContextInteractionEvent event) { return; } - Optional modAuditLog = findModAuditLogChannel(event); + Optional modAuditLog = findModMailChannel(event); if (modAuditLog.isEmpty()) { event.reply(FAILED_MESSAGE).setEphemeral(true).queue(); return; @@ -149,7 +149,7 @@ private boolean handleWasAlreadyReportedMessage(MessageContextInteractionEvent e return false; } - private Optional findModAuditLogChannel(MessageContextInteractionEvent event) { + private Optional findModMailChannel(MessageContextInteractionEvent event) { Guild guild = Objects.requireNonNull(event.getGuild()); Optional modMailChannel = Guilds.findTextChannel(guild, isModMailChannel); if (modMailChannel.isEmpty()) {