Skip to content

Commit f173551

Browse files
authored
Fixed another false positive (#1219)
1 parent cd75db6 commit f173551

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

application/config.json.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"hack",
4545
"steamcommunity",
4646
"freenitro",
47-
"usd",
4847
"^earn",
4948
".exe"
5049
],

application/src/main/java/org/togetherjava/tjbot/features/moderation/scam/ScamDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void analyzeToken(String token, AnalyseResults results) {
6767
results.containsSuspiciousKeyword = true;
6868
}
6969

70-
if (!results.containsDollarSign && token.contains("$")) {
70+
if (!results.containsDollarSign && (token.contains("$") || "usd".equalsIgnoreCase(token))) {
7171
results.containsDollarSign = true;
7272
}
7373

application/src/test/java/org/togetherjava/tjbot/features/moderation/scam/ScamDetectorTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ void setUp() {
2626
ScamBlockerConfig scamConfig = mock(ScamBlockerConfig.class);
2727
when(config.getScamBlocker()).thenReturn(scamConfig);
2828

29-
when(scamConfig.getSuspiciousKeywords()).thenReturn(Set.of("nitro", "boob", "sexy", "sexi",
30-
"esex", "steam", "gift", "onlyfans", "bitcoin", "btc", "promo", "trader", "trading",
31-
"whatsapp", "crypto", "claim", "teen", "adobe", "hack", "steamcommunity",
32-
"freenitro", "usd", "^earn", ".exe"));
29+
when(scamConfig.getSuspiciousKeywords())
30+
.thenReturn(Set.of("nitro", "boob", "sexy", "sexi", "esex", "steam", "gift", "onlyfans",
31+
"bitcoin", "btc", "promo", "trader", "trading", "whatsapp", "crypto", "claim",
32+
"teen", "adobe", "hack", "steamcommunity", "freenitro", "^earn", ".exe"));
3333
when(scamConfig.getHostWhitelist()).thenReturn(Set.of("discord.com", "discord.media",
3434
"discordapp.com", "discordapp.net", "discordstatus.com"));
3535
when(scamConfig.getHostBlacklist()).thenReturn(Set.of("bit.ly", "discord.gg", "teletype.in",
@@ -243,6 +243,8 @@ private static List<String> provideRealScamMessages() {
243243
private static List<String> provideRealFalsePositiveMessages() {
244244
return List
245245
.of("""
246-
https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/types/anonymous-types""");
246+
https://learn.microsoft.com/en-us/dotnet/csharp/fundamentals/types/anonymous-types""",
247+
"""
248+
And according to quick google search. Median wage is about $23k usd""");
247249
}
248250
}

0 commit comments

Comments
 (0)