[ChatAntiSpamModule] Add consecutiveUnfilteredThreshold config

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/ChatAntiSpamModule.kt

@@ -180,11 +180,17 @@ object ChatAntiSpamModule: BukkitModule<ChatAntiSpamModule.ModuleConfig, ChatAnt
         get() = parsed("prefix", localed(locale) { this.prefix })
 
     data class ModuleConfig(
+        @Comment("Enable to notify console anti-spam messages")
         val notifyConsole: Boolean = true,
         val userDataExpiresAfter: Duration = 20.minutes.toJavaDuration(),
         val baseMuteDuration: Duration = 10.minutes.toJavaDuration(),
         val expireSize: ExpireSize = ExpireSize(),
         val expireTime: ExpireTime = ExpireTime(),
+        @Comment("""
+            Remove one oldest filtered record if the player sends multiple unfiltered chat message in a row.
+            Set to non-positive value to disable this, and record only expires after configured time above.
+        """)
+        val consecutiveUnfilteredThreshold: Int = 3,
         val muteHandler: MuteHandler = MuteHandler(),
         val spamCheck: DefaultedEnumMap<MessageType, SpamCheck> =
             DefaultedEnumMap(MessageType::class.java, SpamCheck()).apply {

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam/CasListeners.kt

@@ -33,6 +33,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerCommandPreprocessEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.math.min
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -99,6 +100,7 @@ object CasListeners: Listener {
         }
     }
 
+    @OptIn(ExperimentalAtomicApi::class)
     private fun checkBlocked(player: Player, message: String, messageMeta: MessageMeta): Boolean {
         val user = player.user
         if (user.hasPerm("bypass")) {
@@ -189,7 +191,15 @@ object CasListeners: Listener {
             }
         }
         if (!blockValue) {
+            if (config.consecutiveUnfilteredThreshold > 0 && spamData.filtered.isNotEmpty()) {
+                if (spamData.consecutiveUnfiltered.addAndFetch(1) >= config.consecutiveUnfilteredThreshold) {
+                    spamData.filtered.removeFirst()
+                    spamData.consecutiveUnfiltered.store(0)
+                }
+            }
             spamData.records.sizedAdd(config.expireSize.messageRecord, SpamData.MessageRecord(request.message, now))
+        } else {
+            spamData.consecutiveUnfiltered.store(0)
         }
         return blockValue
     }

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam/check/ConsecutiveUnfilteredFilter.kt

@@ -0,0 +1,20 @@
+package io.github.rothes.esu.bukkit.module.chatantispam.check
+
+import io.github.rothes.esu.bukkit.module.chatantispam.message.MessageRequest
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+
+object ConsecutiveUnfilteredFilter: Check("consecutive-unfiltered-filter") {
+
+    @OptIn(ExperimentalAtomicApi::class)
+    override fun check(request: MessageRequest): CheckResult {
+        if (config.consecutiveUnfilteredThreshold > 0) {
+            if (request.spamData.consecutiveUnfiltered.addAndFetch(1) >= config.consecutiveUnfilteredThreshold) {
+                request.spamData.consecutiveUnfiltered.store(0)
+            }
+        }
+        if (request.spamCheck.letterCase.uniformOnCheck) {
+            request.message = request.message.lowercase()
+        }
+        return CheckResult()
+    }
+}

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/module/chatantispam/user/SpamData.kt

@@ -2,8 +2,13 @@ package io.github.rothes.esu.bukkit.module.chatantispam.user
 
 import com.google.gson.annotations.SerializedName
 import io.github.rothes.esu.bukkit.module.ChatAntiSpamModule.config
+import io.github.rothes.esu.bukkit.module.chatantispam.user.CasDataManager.ChatSpamTable.lastAccess
 import io.github.rothes.esu.core.util.extension.DurationExt.compareTo
 import io.github.rothes.esu.core.util.extension.DurationExt.valuePositive
+import jdk.internal.net.http.common.Log.requests
+import net.minecraft.data.worldgen.placement.PlacementUtils.filtered
+import kotlin.concurrent.atomics.AtomicInt
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
 data class SpamData(
     @SerializedName("t", alternate = ["muteUntil"])
@@ -32,9 +37,12 @@ data class SpamData(
      */
     @SerializedName("ft", alternate = ["filtered"])
     val filtered: ArrayDeque<Long> = ArrayDeque(),
-    @Transient
-    var lastAccess: Long = -1,
 ) {
+
+    @OptIn(ExperimentalAtomicApi::class)
+    @Transient var consecutiveUnfiltered: AtomicInt = AtomicInt(0)
+    @Transient var lastAccess: Long = -1
+
     fun mute(): Long {
         val now = System.currentTimeMillis()
         if (now - muteUntil <= config.muteHandler.muteDurationMultiplier.maxMuteInterval) {