Skip to content

Fix: audit message being empty for attachment-only scam posts (#1300) #1325

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
merged 4 commits into from
Sep 15, 2025
Merged

Fix: audit message being empty for attachment-only scam posts (#1300) #1325

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f898cc2
Fix: audit message being empty for attachment-only scam posts (#1300)
JankiGadhiya Sep 12, 2025
6220219
spotless formatting
Zabuzard Sep 15, 2025
ba086c3
ux improvements for the text
Zabuzard Sep 15, 2025
292b66e
small fix with extra space
Zabuzard Sep 15, 2025
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
28 changes: 19 additions & 9 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 @@ -48,6 +48,7 @@
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
* Listener that receives all sent messages from channels, checks them for scam and takes
Expand Down Expand Up @@ -247,15 +248,24 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,

User author = event.getAuthor();
String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();

MessageEmbed embed =
new EmbedBuilder().setDescription(event.getMessage().getContentStripped())
.setTitle(reportTitle)
.setAuthor(author.getName(), null, avatarOrDefaultUrl)
.setTimestamp(event.getMessage().getTimeCreated())
.setColor(AMBIENT_COLOR)
.setFooter(author.getId())
.build();
String content = event.getMessage().getContentStripped();
List<Message.Attachment> attachments = event.getMessage().getAttachments();

if (!attachments.isEmpty()) {
String attachmentInfo = attachments.stream()
.map(Message.Attachment::getFileName)
.collect(Collectors.joining(", "));
content += "%s(The message has %d attachment%s: %s)".formatted(
content.isBlank() ? "" : "\n", attachments.size(),
attachments.size() > 1 ? "s " : "", attachmentInfo);
}
MessageEmbed embed = new EmbedBuilder().setDescription(content)
.setTitle(reportTitle)
.setAuthor(author.getName(), null, avatarOrDefaultUrl)
.setTimestamp(event.getMessage().getTimeCreated())
.setColor(AMBIENT_COLOR)
.setFooter(author.getId())
.build();

MessageCreateBuilder messageBuilder = new MessageCreateBuilder().setEmbeds(embed);
if (!confirmDialog.isEmpty()) {
Expand Down