Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.dv8tion.jda.api.entities.Message;

import java.util.Locale;
import java.util.Optional;
import java.util.Set;

Expand All @@ -10,7 +11,9 @@ record Attachment(String fileName) {
Set.of("jpg", "jpeg", "png", "gif", "webp", "tiff", "svg", "apng");

boolean isImage() {
return getFileExtension().map(IMAGE_EXTENSIONS::contains).orElse(false);
return getFileExtension().map(ext -> ext.toLowerCase(Locale.US))
.map(IMAGE_EXTENSIONS::contains)
.orElse(false);
}

private Optional<String> getFileExtension() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,23 @@ void ignoresHarmlessAttachments() {
assertFalse(isScamResult);
}

@Test
@DisplayName("Messages containing suspicious attachments are flagged even if extensions are upper-case (jpg vs JPG)")
void detectsSuspiciousAttachmentsRegardlessOfCase() {
// GIVEN an empty message containing suspicious attachments with mixed case for extensions
String content = "";
List<Message.Attachment> attachments =
List.of(createImageAttachmentMock("1.JPG"), createImageAttachmentMock("2.JPG"),
createImageAttachmentMock("3.jpg"), createImageAttachmentMock("4.jpg"));
Message message = createMessageMock(content, attachments);

// WHEN analyzing it
boolean isScamResult = scamDetector.isScam(message);

// THEN flags it as scam
assertTrue(isScamResult);
}

@Test
@DisplayName("Suspicious messages send by trusted users are not flagged")
void ignoreTrustedUser() {
Expand Down