Skip to content

chore: update channel used in ThisIsScamCommand to modmail instead of mod-audit-logs #1509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
surajkumar merged 3 commits into from
Jun 24, 2026
Merged

chore: update channel used in ThisIsScamCommand to modmail instead of mod-audit-logs #1509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bbb58d
chore: update channel used in `ThisIsScamCommand` to `modmail` instea…
surajkumar Jun 24, 2026
3146400
chore: rename var to match modmail
surajkumar Jun 24, 2026
8847744
chore: rename method name to match modmail
surajkumar Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions application/src/main/java/org/togetherjava/tjbot/features/moderation/ThisIsScamCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public final class ThisIsScamCommand extends BotCommandAdapter implements Messag

private final Config config;
private final ModerationActionsStore actionsStore;
private final Predicate<String> isModAuditLogChannel;
private final Predicate<String> isModMailChannel;

private final Cache<Long, Instant> reportedMessageToTimestamp =
Caffeine.newBuilder().maximumSize(10_000).expireAfterWrite(Duration.ofDays(1)).build();
Expand All @@ -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
Expand All @@ -99,7 +98,7 @@ public void onMessageContext(MessageContextInteractionEvent event) {
return;
}

Optional<TextChannel> modAuditLog = findModAuditLogChannel(event);
Optional<TextChannel> modAuditLog = findModMailChannel(event);
if (modAuditLog.isEmpty()) {
event.reply(FAILED_MESSAGE).setEphemeral(true).queue();
return;
Expand Down Expand Up @@ -150,16 +149,15 @@ private boolean handleWasAlreadyReportedMessage(MessageContextInteractionEvent e
return false;
}

private Optional<TextChannel> findModAuditLogChannel(MessageContextInteractionEvent event) {
private Optional<TextChannel> findModMailChannel(MessageContextInteractionEvent event) {
Guild guild = Objects.requireNonNull(event.getGuild());
Optional<TextChannel> modAuditLogChannel =
Guilds.findTextChannel(guild, isModAuditLogChannel);
if (modAuditLogChannel.isEmpty()) {
Optional<TextChannel> 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) {
Expand Down
Loading