Skip to content

Release v.4.19.1 #1288

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 2 commits into from
Jul 29, 2025
Merged

Release v.4.19.1 #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59c3daf
(Added scam message) (#1286)
Zabuzard Jul 28, 2025
7b5dbb1
Fixed ScamDetector ignoring untrusted users and firing against truste…
Zabuzard Jul 29, 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
3 changes: 2 additions & 1 deletion application/config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"freenitro",
"^earn$",
"^earning",
".exe$"
".exe$",
"mrbeast"
],
"hostWhitelist": [
"discord.com",
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/org/togetherjava/tjbot/features/moderation/scam/ScamDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public ScamDetector(Config config) {
public boolean isScam(Message message) {
Member author = message.getMember();
boolean isTrustedUser = author != null
&& author.getRoles().stream().map(Role::getName).noneMatch(hasTrustedRole);
&& author.getRoles().stream().map(Role::getName).anyMatch(hasTrustedRole);
if (isTrustedUser) {
return false;
}
Expand Down
7 changes: 4 additions & 3 deletions ...ation/src/test/java/org/togetherjava/tjbot/features/moderation/scam/ScamDetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void setUp() {
when(scamConfig.getSuspiciousKeywords()).thenReturn(Set.of("nitro", "boob", "sexy", "sexi",
"esex", "steam", "gift", "onlyfans", "bitcoin", "btc", "promo", "trader", "trading",
"whatsapp", "crypto", "^claim", "teen", "adobe", "hack", "steamcommunity",
"freenitro", "^earn$", "^earning", ".exe$"));
"freenitro", "^earn$", "^earning", ".exe$", "mrbeast"));
when(scamConfig.getHostWhitelist()).thenReturn(Set.of("discord.com", "discord.media",
"discordapp.com", "discordapp.net", "discordstatus.com", "thehackernews.com",
"gradle.org", "help.gradle.org", "youtube.com", "www.youtube.com"));
Expand Down Expand Up @@ -223,7 +223,7 @@ void ignoreTrustedUser() {
boolean isScamResult = scamDetector.isScam(message);

// THEN flags it as harmless
assertTrue(isScamResult);
assertFalse(isScamResult);
}

private static Message createMessageMock(String content, List<Message.Attachment> attachments) {
Expand Down Expand Up @@ -400,7 +400,8 @@ B2CWorkflow Builder (React Flow)
Ready to unlock your earning potential in the digital market? you can start earning $100,000 and even more
as a beginner from the digital market, DM me for expert guidance or contact me directly on telegram and start building your financial future.
Telegram username @JohnSmith123""",
"Grab it before it's deleted (available for Windows and macOS): https://www.reddit.com/r/TVBaFreeHub/comments/12345t/ninaatradercrackedfullpowertradingfreefor123/");
"Grab it before it's deleted (available for Windows and macOS): https://www.reddit.com/r/TVBaFreeHub/comments/12345t/ninaatradercrackedfullpowertradingfreefor123/",
"Bro, claim 0.1 BTC now! Use promo code \"mrbeast\" at expmcoins.com screen @everyone");
}

private static List<String> provideRealFalsePositiveMessages() {
Expand Down
Loading