fix: Improved permission filtering

Author: 4drian3d

build.gradle.kts

@@ -37,8 +37,8 @@ tasks {
     runVelocity {
         velocityVersion(libs.versions.velocity.get())
         downloadPlugins {
-            url("https://cdn.modrinth.com/data/1iWA0pjH/versions/3PY3lTnr/MCKotlinVelocity-1.5.1-k2.0.21.jar")
-            url("https://cdn.modrinth.com/data/HQyibRsN/versions/pxgKwgNJ/MiniPlaceholders-Velocity-2.2.4.jar")
+            modrinth("mckotlin", "3PY3lTnr")
+            modrinth("miniplaceholders", "Nsctgs29")
         }
     }
     shadowJar {
@@ -73,7 +73,7 @@ sourceSets {
 
 kotlin {
     jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 

src/main/kotlin/io/github/_4drian3d/clientcatcher/ClientCatcher.kt

@@ -77,5 +77,5 @@ class ClientCatcher @Inject constructor(
     }.exceptionally {
         componentLogger.error("Cannot load configuration", it)
         false
-    }!!
+    }
 }

src/main/kotlin/io/github/_4drian3d/clientcatcher/Extensions.kt

@@ -2,6 +2,7 @@ package io.github._4drian3d.clientcatcher
 
 import com.velocitypowered.api.command.CommandSource
 import com.velocitypowered.api.proxy.ConsoleCommandSource
+import com.velocitypowered.api.proxy.ProxyServer
 import io.github._4drian3d.clientcatcher.configuration.Configuration
 import io.github._4drian3d.clientcatcher.webhook.Replacer
 import io.github._4drian3d.jdwebhooks.Embed
@@ -21,6 +22,11 @@ val hasMiniPlaceholders by lazy {
     }
 }
 
+fun ProxyServer.doWithFilteredAudience(permission: String, action: (CommandSource) -> Unit) {
+    action.invoke(this.consoleCommandSource)
+    allPlayers.forEach { if (it.hasPermission(permission)) action.invoke(it) }
+}
+
 private fun String.asMiniMessage(resolver: TagResolver) = MiniMessage.miniMessage().deserialize(this, resolver)
 
 fun CommandSource.sendMini(message: String, logger: ComponentLogger, resolver: TagResolver) {

src/main/kotlin/io/github/_4drian3d/clientcatcher/listener/BrandListener.kt

@@ -3,12 +3,12 @@ package io.github._4drian3d.clientcatcher.listener
 import com.velocitypowered.api.event.EventTask
 import com.velocitypowered.api.event.player.PlayerClientBrandEvent
 import io.github._4drian3d.clientcatcher.ClientCatcher
+import io.github._4drian3d.clientcatcher.doWithFilteredAudience
 import io.github._4drian3d.clientcatcher.event.BlockedClientEvent
 import io.github._4drian3d.clientcatcher.objects.CatcherCommandSource
 import io.github._4drian3d.clientcatcher.sendMini
 import io.github._4drian3d.clientcatcher.sendWebHook
 import io.github._4drian3d.clientcatcher.webhook.Replacer
-import net.kyori.adventure.permission.PermissionChecker
 
 class BrandListener(private val plugin: ClientCatcher) : Listener<PlayerClientBrandEvent> {
     override fun executeAsync(event: PlayerClientBrandEvent): EventTask {
@@ -20,12 +20,9 @@ class BrandListener(private val plugin: ClientCatcher) : Listener<PlayerClientBr
 
             sendWebHook(plugin, resolver, plugin.configuration.webHook.client)
 
-            plugin.proxyServer
-                .filterAudience {
-                    it.get(PermissionChecker.POINTER).map { pointer ->
-                        pointer.test("clientcatcher.alert.client")
-                    }.orElse(false)
-                }.sendMini(plugin.messages.alert.client, plugin.componentLogger, resolver)
+            plugin.proxyServer.doWithFilteredAudience("clientcatcher.alert.client") {
+                it.sendMini(plugin.messages.alert.client, plugin.componentLogger, resolver)
+            }
 
             for (client in plugin.configuration.blocked.clients) {
                 if (event.brand.equals(client.name, ignoreCase = true)) {

src/main/kotlin/io/github/_4drian3d/clientcatcher/listener/ModListener.kt

@@ -3,12 +3,12 @@ package io.github._4drian3d.clientcatcher.listener
 import com.velocitypowered.api.event.EventTask
 import com.velocitypowered.api.event.player.PlayerModInfoEvent
 import io.github._4drian3d.clientcatcher.ClientCatcher
+import io.github._4drian3d.clientcatcher.doWithFilteredAudience
 import io.github._4drian3d.clientcatcher.event.BlockedModEvent
 import io.github._4drian3d.clientcatcher.objects.CatcherCommandSource
 import io.github._4drian3d.clientcatcher.sendMini
 import io.github._4drian3d.clientcatcher.sendWebHook
 import io.github._4drian3d.clientcatcher.webhook.Replacer
-import net.kyori.adventure.permission.PermissionChecker
 
 class ModListener(private val plugin: ClientCatcher) : Listener<PlayerModInfoEvent> {
     override fun executeAsync(event: PlayerModInfoEvent): EventTask {
@@ -20,12 +20,9 @@ class ModListener(private val plugin: ClientCatcher) : Listener<PlayerModInfoEve
 
             sendWebHook(plugin, resolver, plugin.configuration.webHook.mods)
 
-            plugin.proxyServer
-                .filterAudience {
-                    it.get(PermissionChecker.POINTER).map { pointer ->
-                        pointer.test("clientcatcher.alert.mods")
-                    }.orElse(false)
-                }.sendMini(plugin.messages.alert.mods, plugin.componentLogger, resolver)
+            plugin.proxyServer.doWithFilteredAudience("clientcatcher.alert.mods") {
+                it.sendMini(plugin.messages.alert.mods, plugin.componentLogger, resolver)
+            }
 
             for (mod in event.modInfo.mods) for (blocked in plugin.configuration.blocked.mods) {
                 if (blocked.name.equals(mod.id, ignoreCase = true)) {