Skip to content

Fix: ScamBlocker does not scan edited messages #1519

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

Closed
KonstantineVashalomidze wants to merge 2 commits into from
Closed

Fix: ScamBlocker does not scan edited messages #1519

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b745ecc
fix: scan edited messages in ScamBlocker to prevent scam bypass
Jul 10, 2026
a25833c
fix: remove unused guild parameter from private methods
Jul 10, 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
122 changes: 66 additions & 56 deletions application/src/main/java/org/togetherjava/tjbot/features/moderation/scam/ScamBlocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
import net.dv8tion.jda.api.exceptions.ErrorHandler;
import net.dv8tion.jda.api.interactions.components.buttons.Button;
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
Expand Down Expand Up @@ -125,7 +126,16 @@ public void acceptComponentIdGenerator(ComponentIdGenerator generator) {

@Override
public void onMessageReceived(MessageReceivedEvent event) {
if (event.getAuthor().isBot() || event.isWebhookMessage()) {
handleMessage(event.getMessage(), event.getGuild());
}

@Override
public void onMessageUpdated(MessageUpdateEvent event) {
handleMessage(event.getMessage(), event.getGuild());
}

private void handleMessage(Message message, Guild guild) {
if (message.getAuthor().isBot() || message.isWebhookMessage()) {
return;
}

Expand All @@ -134,12 +144,11 @@ public void onMessageReceived(MessageReceivedEvent event) {
}

boolean isSafe = true;
if (event.getChannel() instanceof TextChannel textChannel
if (message.getChannel() instanceof TextChannel textChannel
&& isBotTrapChannel.test(textChannel)) {
isSafe = false;
}

Message message = event.getMessage();
if (isSafe && scamDetector.isScam(message)) {
isSafe = false;
}
Expand All @@ -149,81 +158,84 @@ public void onMessageReceived(MessageReceivedEvent event) {
}

if (scamHistoryStore.hasRecentScamDuplicate(message)) {
takeActionWasAlreadyReported(event);
takeActionWasAlreadyReported(message);
return;
}

takeAction(event);
takeAction(message, guild);
}

private void takeActionWasAlreadyReported(MessageReceivedEvent event) {
private void takeActionWasAlreadyReported(Message message) {
// The user recently send the same scam already, and that was already reported and handled
addScamToHistory(event);
addScamToHistory(message);

boolean shouldDeleteMessage = MODES_WITH_IMMEDIATE_DELETION.contains(mode);
if (shouldDeleteMessage) {
deleteMessage(event);
deleteMessage(message);
}
}

private void takeAction(MessageReceivedEvent event) {
private void takeAction(Message message, Guild guild) {
metrics.count("scam-detected");
switch (mode) {
case OFF -> throw new AssertionError(
"The OFF-mode should be detected earlier already to prevent expensive computation");
case ONLY_LOG -> takeActionLogOnly(event);
case APPROVE_FIRST -> takeActionApproveFirst(event);
case ONLY_LOG -> takeActionLogOnly(message);
case APPROVE_FIRST -> takeActionApproveFirst(message, guild);
case AUTO_DELETE_BUT_APPROVE_QUARANTINE ->
takeActionAutoDeleteButApproveQuarantine(event);
case AUTO_DELETE_AND_QUARANTINE -> takeActionAutoDeleteAndQuarantine(event);
takeActionAutoDeleteButApproveQuarantine(message, guild);
case AUTO_DELETE_AND_QUARANTINE -> takeActionAutoDeleteAndQuarantine(message, guild);
default -> throw new IllegalArgumentException("Mode not supported: " + mode);
}
}

private void takeActionLogOnly(MessageReceivedEvent event) {
addScamToHistory(event);
logScamMessage(event);
private void takeActionLogOnly(Message message) {
addScamToHistory(message);
logScamMessage(message);
}

private void takeActionApproveFirst(MessageReceivedEvent event) {
addScamToHistory(event);
logScamMessage(event);
reportScamMessage(event, "Is this scam?", createConfirmDialog(event));
private void takeActionApproveFirst(Message message, Guild guild) {
addScamToHistory(message);
logScamMessage(message);
reportScamMessage(message, guild, "Is this scam?", createConfirmDialog(message, guild));
}

private void takeActionAutoDeleteButApproveQuarantine(MessageReceivedEvent event) {
addScamToHistory(event);
logScamMessage(event);
deleteMessage(event);
reportScamMessage(event, "Is this scam? (already deleted)", createConfirmDialog(event));
private void takeActionAutoDeleteButApproveQuarantine(Message message, Guild guild) {
addScamToHistory(message);
logScamMessage(message);
deleteMessage(message);
reportScamMessage(message, guild, "Is this scam? (already deleted)",
createConfirmDialog(message, guild));
}

private void takeActionAutoDeleteAndQuarantine(MessageReceivedEvent event) {
addScamToHistory(event);
logScamMessage(event);
deleteMessage(event);
quarantineAuthor(event);
dmUser(event);
reportScamMessage(event, "Detected and handled scam", List.of());
private void takeActionAutoDeleteAndQuarantine(Message message, Guild guild) {
addScamToHistory(message);
logScamMessage(message);
deleteMessage(message);
quarantineAuthor(message, guild);
dmUser(message, guild);
reportScamMessage(message, guild, "Detected and handled scam", List.of());
}

private void addScamToHistory(MessageReceivedEvent event) {
scamHistoryStore.addScam(event.getMessage(), MODES_WITH_IMMEDIATE_DELETION.contains(mode));
private void addScamToHistory(Message message) {
scamHistoryStore.addScam(message, MODES_WITH_IMMEDIATE_DELETION.contains(mode));
}

private void logScamMessage(MessageReceivedEvent event) {
private void logScamMessage(Message message) {
logger.warn(LogMarkers.SENSITIVE,
"Detected a scam message ('{}') from user '{}' in channel '{}' of guild '{}'.",
event.getMessageId(), event.getAuthor().getId(), event.getChannel().getId(),
event.getGuild().getId());
message.getId(), message.getAuthor().getId(), message.getChannel().getId(),
message.getGuild().getId());
}

private void deleteMessage(MessageReceivedEvent event) {
event.getMessage().delete().queue();
private void deleteMessage(Message message) {
message.delete().queue();
}

private void quarantineAuthor(MessageReceivedEvent event) {
quarantineAuthor(event.getGuild(), event.getMember(), event.getJDA().getSelfUser());
private void quarantineAuthor(Message message, Guild guild) {
quarantineAuthor(guild,
Objects.requireNonNull(message.getMember(), "Author must not be null"),
message.getJDA().getSelfUser());
}

private void quarantineAuthor(Guild guild, Member author, SelfUser bot) {
Expand All @@ -239,9 +251,8 @@ private void quarantineAuthor(Guild guild, Member author, SelfUser bot) {
.queue();
}

private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
private void reportScamMessage(Message message, Guild guild, String reportTitle,
List<? extends Button> confirmDialog) {
Guild guild = event.getGuild();
Optional<TextChannel> reportChannel = getReportChannel(guild);
if (reportChannel.isEmpty()) {
logger.warn(
Expand All @@ -250,10 +261,10 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
return;
}

User author = event.getAuthor();
User author = message.getAuthor();
String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();
String content = event.getMessage().getContentStripped();
List<Message.Attachment> attachments = event.getMessage().getAttachments();
String content = message.getContentStripped();
List<Message.Attachment> attachments = message.getAttachments();

if (!attachments.isEmpty()) {
String attachmentInfo = attachments.stream()
Expand All @@ -266,7 +277,7 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
MessageEmbed embed = new EmbedBuilder().setDescription(content)
.setTitle(reportTitle)
.setAuthor(author.getName(), null, avatarOrDefaultUrl)
.setTimestamp(event.getMessage().getTimeCreated())
.setTimestamp(message.getTimeCreated())
.setColor(AmbientColors.MODERATION_SCAM)
.setFooter(author.getId())
.build();
Expand All @@ -275,13 +286,13 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
if (!confirmDialog.isEmpty()) {
messageBuilder.setActionRow(confirmDialog);
}
MessageCreateData message = messageBuilder.build();
MessageCreateData messageData = messageBuilder.build();

reportChannel.orElseThrow().sendMessage(message).queue();
reportChannel.orElseThrow().sendMessage(messageData).queue();
}

private void dmUser(MessageReceivedEvent event) {
dmUser(event.getGuild(), event.getAuthor().getIdLong(), event.getJDA());
private void dmUser(Message message, Guild guild) {
dmUser(guild, message.getAuthor().getIdLong(), message.getJDA());
}

private void dmUser(Guild guild, long userId, JDA jda) {
Expand Down Expand Up @@ -312,11 +323,10 @@ private Optional<TextChannel> getReportChannel(Guild guild) {
return Guilds.findTextChannel(guild, isReportChannelName);
}

private List<Button> createConfirmDialog(MessageReceivedEvent event) {
ComponentIdArguments args = new ComponentIdArguments(mode, event.getGuild().getIdLong(),
event.getChannel().getIdLong(), event.getMessageIdLong(),
event.getAuthor().getIdLong(),
ScamHistoryStore.hashMessageContent(event.getMessage()));
private List<Button> createConfirmDialog(Message message, Guild guild) {
ComponentIdArguments args = new ComponentIdArguments(mode, guild.getIdLong(),
message.getChannel().getIdLong(), message.getIdLong(),
message.getAuthor().getIdLong(), ScamHistoryStore.hashMessageContent(message));

return List.of(Button.success(generateComponentId(args), "Yes"),
Button.danger(generateComponentId(args), "No"));
Expand Down