|
48 | 48 | import java.util.function.Predicate;
|
49 | 49 | import java.util.function.UnaryOperator;
|
50 | 50 | import java.util.regex.Pattern;
|
| 51 | +import java.util.stream.Collectors; |
51 | 52 |
|
52 | 53 | /**
|
53 | 54 | * Listener that receives all sent messages from channels, checks them for scam and takes
|
@@ -247,15 +248,24 @@ private void reportScamMessage(MessageReceivedEvent event, String reportTitle,
|
247 | 248 |
|
248 | 249 | User author = event.getAuthor();
|
249 | 250 | String avatarOrDefaultUrl = author.getEffectiveAvatarUrl();
|
250 |
| - |
251 |
| - MessageEmbed embed = |
252 |
| - new EmbedBuilder().setDescription(event.getMessage().getContentStripped()) |
253 |
| - .setTitle(reportTitle) |
254 |
| - .setAuthor(author.getName(), null, avatarOrDefaultUrl) |
255 |
| - .setTimestamp(event.getMessage().getTimeCreated()) |
256 |
| - .setColor(AMBIENT_COLOR) |
257 |
| - .setFooter(author.getId()) |
258 |
| - .build(); |
| 251 | + String content = event.getMessage().getContentStripped(); |
| 252 | + List<Message.Attachment> attachments = event.getMessage().getAttachments(); |
| 253 | + |
| 254 | + if (!attachments.isEmpty()) { |
| 255 | + String attachmentInfo = attachments.stream() |
| 256 | + .map(Message.Attachment::getFileName) |
| 257 | + .collect(Collectors.joining(", ")); |
| 258 | + content += "%s(The message has %d attachment%s: %s)".formatted( |
| 259 | + content.isBlank() ? "" : "\n", attachments.size(), |
| 260 | + attachments.size() > 1 ? "s " : "", attachmentInfo); |
| 261 | + } |
| 262 | + MessageEmbed embed = new EmbedBuilder().setDescription(content) |
| 263 | + .setTitle(reportTitle) |
| 264 | + .setAuthor(author.getName(), null, avatarOrDefaultUrl) |
| 265 | + .setTimestamp(event.getMessage().getTimeCreated()) |
| 266 | + .setColor(AMBIENT_COLOR) |
| 267 | + .setFooter(author.getId()) |
| 268 | + .build(); |
259 | 269 |
|
260 | 270 | MessageCreateBuilder messageBuilder = new MessageCreateBuilder().setEmbeds(embed);
|
261 | 271 | if (!confirmDialog.isEmpty()) {
|
|
0 commit comments