Skip to content

Commit 94ab671

Browse files
authored
files without extenions are blacklisted now (#693)
1 parent ddbc619 commit 94ab671

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

application/src/main/java/org/togetherjava/tjbot/commands/moderation/attachment/BlacklistedAttachmentListener.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.togetherjava.tjbot.config.Config;
1616
import org.togetherjava.tjbot.moderation.ModAuditLogWriter;
1717

18-
import java.awt.Color;
18+
import java.awt.*;
1919
import java.util.List;
2020
import java.util.Locale;
2121
import java.util.function.UnaryOperator;
@@ -103,17 +103,21 @@ private MessageCreateData createBaseResponse(String originalMessageContent,
103103
private List<String> getBlacklistedAttachmentsFromMessage(Message originalMessage) {
104104
return originalMessage.getAttachments()
105105
.stream()
106-
.filter(attachment -> blacklistedFileExtensions
107-
.contains(attachment.getFileExtension().toLowerCase(Locale.US)))
106+
.filter(this::containsBlacklistedFileExtensions)
108107
.map(Message.Attachment::getFileName)
109108
.toList();
110109
}
111110

112111
private boolean doesMessageContainBlacklistedContent(Message message) {
113-
return message.getAttachments()
114-
.stream()
115-
.anyMatch(attachment -> blacklistedFileExtensions
116-
.contains(attachment.getFileExtension().toLowerCase(Locale.US)));
112+
return message.getAttachments().stream().anyMatch(this::containsBlacklistedFileExtensions);
113+
}
114+
115+
private boolean containsBlacklistedFileExtensions(Message.Attachment attachment) {
116+
if (attachment.getFileExtension() == null) {
117+
return true;
118+
}
119+
return blacklistedFileExtensions
120+
.contains(attachment.getFileExtension().toLowerCase(Locale.US));
117121
}
118122

119123
private void warnMods(Message sentUserMessage) {

0 commit comments

Comments
 (0)