added extra "trustedUserRolePattern" config entry

Author: Zabuzard

application/config.json.template

@@ -22,6 +22,7 @@
         "mode": "AUTO_DELETE_BUT_APPROVE_QUARANTINE",
         "reportChannelPattern": "commands",
         "botTrapChannelPattern": "bot-trap",
+        "trustedUserRolePattern": "Top Helpers .+|Moderator|Community Ambassador|Expert",
         "suspiciousKeywords": [
             "nitro",
             "boob",

application/src/main/java/org/togetherjava/tjbot/config/ScamBlockerConfig.java

@@ -18,6 +18,7 @@ public final class ScamBlockerConfig {
     private final Mode mode;
     private final String reportChannelPattern;
     private final String botTrapChannelPattern;
+    private final String trustedUserRolePattern;
     private final Set<String> suspiciousKeywords;
     private final Set<String> hostWhitelist;
     private final Set<String> hostBlacklist;
@@ -32,6 +33,8 @@ private ScamBlockerConfig(@JsonProperty(value = "mode", required = true) Mode mo
                     required = true) String reportChannelPattern,
             @JsonProperty(value = "botTrapChannelPattern",
                     required = true) String botTrapChannelPattern,
+            @JsonProperty(value = "trustedUserRolePattern",
+                    required = true) String trustedUserRolePattern,
             @JsonProperty(value = "suspiciousKeywords",
                     required = true) Set<String> suspiciousKeywords,
             @JsonProperty(value = "hostWhitelist", required = true) Set<String> hostWhitelist,
@@ -47,6 +50,7 @@ private ScamBlockerConfig(@JsonProperty(value = "mode", required = true) Mode mo
         this.mode = Objects.requireNonNull(mode);
         this.reportChannelPattern = Objects.requireNonNull(reportChannelPattern);
         this.botTrapChannelPattern = Objects.requireNonNull(botTrapChannelPattern);
+        this.trustedUserRolePattern = Objects.requireNonNull(trustedUserRolePattern);
         this.suspiciousKeywords = new HashSet<>(Objects.requireNonNull(suspiciousKeywords));
         this.hostWhitelist = new HashSet<>(Objects.requireNonNull(hostWhitelist));
         this.hostBlacklist = new HashSet<>(Objects.requireNonNull(hostBlacklist));
@@ -86,6 +90,15 @@ public String getBotTrapChannelPattern() {
         return botTrapChannelPattern;
     }
 
+    /**
+     * Gets the REGEX pattern used to identify roles that will be ignored for scam detection.
+     *
+     * @return the REGEX pattern
+     */
+    public String getTrustedUserRolePattern() {
+        return trustedUserRolePattern;
+    }
+
     /**
      * Gets the set of keywords that are considered suspicious if they appear in a message.
      *

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

@@ -37,9 +37,10 @@ public ScamDetector(Config config) {
         this.config = config.getScamBlocker();
 
         isSuspiciousAttachmentName =
-                Pattern.compile(config.getScamBlocker().getSuspiciousAttachmentNamePattern())
+                Pattern.compile(this.config.getSuspiciousAttachmentNamePattern())
                     .asMatchPredicate();
-        hasTrustedRole = Pattern.compile(config.getSoftModerationRolePattern()).asMatchPredicate();
+        hasTrustedRole =
+                Pattern.compile(this.config.getTrustedUserRolePattern()).asMatchPredicate();
     }
 
     /**

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

@@ -51,7 +51,7 @@ void setUp() {
         when(scamConfig.getSuspiciousAttachmentNamePattern())
             .thenReturn(SUSPICIOUS_ATTACHMENT_NAME);
 
-        when(config.getSoftModerationRolePattern()).thenReturn("Moderator|Community Ambassador");
+        when(scamConfig.getTrustedUserRolePattern()).thenReturn("Moderator");
 
         scamDetector = new ScamDetector(config);
     }