fix: update punishment cache to only fetch active mutes and bans

- Renamed `mutes` and `bans` to `activeMutes` and `activeBans` for clarity.
- Ensured active punishments are correctly fetched and used across the system.
- Added `allowed` property to punishment result types for improved validation logic.

Author: twisti-dev

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/punishment/CloudPlayerPunishmentManager.kt

@@ -95,22 +95,35 @@ interface PunishmentLoginValidation {
 
     @NonExtendable
     interface PunishmentCache {
-        val mutes: List<PunishmentMute>
-        val bans: List<PunishmentBan>
+        val activeMutes: List<PunishmentMute>
+        val activeBans: List<PunishmentBan>
         val kicks: List<PunishmentKick>
         val warnings: List<PunishmentWarn>
     }
 
     @Serializable
+    @Suppress("ClassName")
     sealed interface Result {
+        val allowed: Boolean
 
         @Serializable
-        data object ALLOWED : Result
+        data object ALLOWED : Result {
+            override val allowed: Boolean = true
+        }
 
         @Serializable
-        data class DENIED(val reason: Component) : Result
+        data class DENIED(val reason: Component) : Result {
+            override val allowed: Boolean = false
+        }
 
         @Serializable
-        data object ERROR : Result
+        data object ERROR : Result {
+            override val allowed: Boolean = false
+        }
+
+        @Serializable
+        data object NOT_HANDLED : Result {
+            override val allowed: Boolean = true
+        }
     }
 }

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/PunishmentCacheImpl.kt

@@ -9,8 +9,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PunishmentCacheImpl(
-    override val mutes: List<PunishmentMuteImpl>,
-    override val bans: List<PunishmentBanImpl>,
+    override val activeMutes: List<PunishmentMuteImpl>,
+    override val activeBans: List<PunishmentBanImpl>,
     override val kicks: List<PunishmentKickImpl>,
     override val warnings: List<PunishmentWarnImpl>,
 ) : PunishmentLoginValidation.PunishmentCache

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/punishment/CloudPlayerPunishmentManagerBridgeImpl.kt

@@ -98,7 +98,7 @@ class CloudPlayerPunishmentManagerBridgeImpl : CloudPlayerPunishmentManagerBridg
                 return PrePlayerJoinTask.Result.ERROR
             }
 
-            val longestBan = cache.bans.find { it.active }
+            val longestBan = cache.activeBans.find { it.active }
             val banResult = if (longestBan != null) {
                 PrePlayerJoinTask.Result.DENIED(
                     MessageManager.Punish.Ban(longestBan).banDisconnectComponent()
@@ -114,7 +114,7 @@ class CloudPlayerPunishmentManagerBridgeImpl : CloudPlayerPunishmentManagerBridg
 
             for (validation in loginValidations) {
                 val result = validation.performLoginCheck(player, cache)
-                if (result !is PunishmentLoginValidation.Result.ALLOWED) {
+                if (!result.allowed) {
                     return wrap(result)
                 }
             }
@@ -126,6 +126,7 @@ class CloudPlayerPunishmentManagerBridgeImpl : CloudPlayerPunishmentManagerBridg
             PunishmentLoginValidation.Result.ALLOWED -> PrePlayerJoinTask.Result.ALLOWED
             is PunishmentLoginValidation.Result.DENIED -> PrePlayerJoinTask.Result.DENIED(from.reason)
             PunishmentLoginValidation.Result.ERROR -> PrePlayerJoinTask.Result.ERROR
+            else -> PrePlayerJoinTask.Result.ERROR
         }
     }
 }

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/punishment/PunishmentManagerImpl.kt

@@ -343,14 +343,14 @@ class PunishmentManagerImpl(private val service: PunishmentService) : Punishment
     }
 
     private suspend fun fetchPunishmentCache(uuid: UUID): PunishmentCacheImpl = coroutineScope {
-        val mutesDeferred = async { fetchMutes(uuid, onlyActive = false) }
-        val bansDeferred = async { fetchBans(uuid, onlyActive = false) }
+        val mutesDeferred = async { fetchMutes(uuid, onlyActive = true) }
+        val bansDeferred = async { fetchBans(uuid, onlyActive = true) }
         val kicksDeferred = async { fetchKicks(uuid) }
         val warningsDeferred = async { fetchWarnings(uuid) }
 
         PunishmentCacheImpl(
-            mutes = mutesDeferred.await().sorted().toObjectList(),
-            bans = bansDeferred.await().sorted().toObjectList(),
+            activeMutes = mutesDeferred.await().sorted().toObjectList(),
+            activeBans = bansDeferred.await().sorted().toObjectList(),
             kicks = kicksDeferred.await().toObjectList(),
             warnings = warningsDeferred.await().toObjectList()
         )

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/punishment/handler/DefaultBanPunishmentHandler.kt

@@ -58,8 +58,7 @@ class DefaultBanPunishmentHandler(private val punishmentManager: PunishmentManag
             return PrePlayerJoinTask.Result.ERROR
         }
         val player = player as StandaloneCloudPlayerImpl
-        val activeBans = cache.bans.filter { it.active }
-        activeBans.mapAsync { it.attachIpAddress(player.ip) }.awaitAll()
+        cache.activeBans.mapAsync { it.attachIpAddress(player.ip) }.awaitAll()
 
         return PrePlayerJoinTask.Result.ALLOWED
     }