Skip to content

Pardon first image scam filter match, adjust warning reason #356

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
FloatingMilkshake merged 1 commit into from
Jun 13, 2026
Merged

Pardon first image scam filter match, adjust warning reason #356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 27 additions & 2 deletions Events/MessageEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,34 @@ private static async Task<bool> RunScamImageFilterAsync(DiscordClient client, Mo
else
Program.discord.Logger.LogDebug("Message {messageId} in {channelId} by user {userId} triggered scam image URL filter", message.Id, channel.Id, message.Author.Id);

await DeleteAndWarnAsync(message, "Attempted scam message", client, wasAutoModBlock: wasAutoModBlock, messageContentOverride: messageContentOverride);
await DiscordHelpers.ThreadChannelAwareDeleteMessageAsync(message);

return true;
string reason = "Possible scam message";

if (!Program.redis.SetContains("scamMessagePardoned", message.Author.Id.ToString()))
{
await Program.redis.SetAddAsync("scamMessagePardoned", message.Author.Id.ToString());
string output = $"{Program.cfgjson.Emoji.Information} {message.Author.Mention}, your message was deleted because it matched patterns of common scam messages." +
$"\nWhen sending multiple images, please either send them separately or include some text in your message to avoid triggering filters.";
DiscordMessage msg = await channel.SendMessageAsync(output);
await InvestigationsHelpers.SendInfringingMessaageAsync("investigations", message, reason, DiscordHelpers.MessageLink(msg), messageContentOverride: messageContentOverride);
await InvestigationsHelpers.SendInfringingMessaageAsync("mod", message, reason, DiscordHelpers.MessageLink(msg), messageContentOverride: messageContentOverride);
return true;
}
else
{
string output = $"{Program.cfgjson.Emoji.Denied} {message.Author.Mention} was automatically warned: **{reason.Replace("`", "\\`").Replace("*", "\\*")}**\n"
+ $"When sending multiple images, please either send them separately or include some text in your message to avoid triggering filters.";
DiscordMessageBuilder messageBuilder = new();
messageBuilder.WithContent(output);
DiscordMessage msg = await channel.SendMessageAsync(output);

await InvestigationsHelpers.SendInfringingMessaageAsync("mod", message, reason, null, messageContentOverride: messageContentOverride);
var warning = await WarningHelpers.GiveWarningAsync(message.Author, client.CurrentUser, reason, contextMessage: msg, channel, " automatically ");
await InvestigationsHelpers.SendInfringingMessaageAsync("investigations", message, reason, warning.ContextLink, messageContentOverride: messageContentOverride);

return true;
}
}
return false;
}
Expand Down