refactor: remove ChatServer, ChatGroup, and related plugin messaging components, replace with surfCoreApi for server management functionality

Author: TheBjoRedCraft

.idea/kotlinc.xml

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.10-4.0.5-SNAPSHOT
+version=1.21.10-4.0.6-SNAPSHOT

gradle.properties

@@ -5,7 +5,6 @@ import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.entry.HistoryEntry
 import dev.slne.surf.chat.api.entry.HistoryFilter
 import dev.slne.surf.chat.api.message.MessageType
-import dev.slne.surf.chat.api.server.ChatServer
 import dev.slne.surf.surfapi.core.api.util.requiredService
 import it.unimi.dsi.fastutil.objects.ObjectSet
 import net.kyori.adventure.chat.SignedMessage
@@ -35,7 +34,7 @@ interface SurfChatApi {
         sender: User,
         receiver: User? = null,
         sentAt: Long = System.currentTimeMillis(),
-        server: ChatServer = ChatServer.default(),
+        server: String = "unspecified",
         channel: Channel? = null,
         signedMessage: SignedMessage? = null,
         messageUuid: UUID = UUID.randomUUID()

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/SurfChatApi.kt

@@ -1,7 +1,6 @@
 package dev.slne.surf.chat.api.entry
 
 import dev.slne.surf.chat.api.message.MessageType
-import dev.slne.surf.chat.api.server.ChatServer
 import java.util.*
 
 /**
@@ -26,7 +25,7 @@ data class HistoryFilter(
     val messageType: MessageType?,
     val range: Long?,
     val messageLike: String?,
-    val server: ChatServer?,
+    val server: String?,
     val channel: String?,
     val deletedBy: String?,
     val type: MessageType?,

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/entry/HistoryFilter.kt

@@ -3,7 +3,6 @@ package dev.slne.surf.chat.api.message
 import dev.slne.surf.chat.api.channel.Channel
 import dev.slne.surf.chat.api.entity.User
 import dev.slne.surf.chat.api.serializer.SerializableSignature
-import dev.slne.surf.chat.api.server.ChatServer
 import dev.slne.surf.surfapi.core.api.messages.adventure.plain
 import dev.slne.surf.surfapi.core.api.serializer.adventure.component.SerializableComponent
 import kotlinx.serialization.Contextual
@@ -73,7 +72,7 @@ data class MessageData(
      * The `server` property is particularly useful when messages or communication need to be
      * associated with specific servers in a multi-server environment.
      */
-    val server: ChatServer,
+    val server: String,
 
     /**
      * Represents the associated chat channel for a message.

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/message/MessageData.kt

@@ -3,21 +3,13 @@ package dev.slne.surf.chat.bukkit
 import dev.slne.surf.chat.bukkit.listener.AsyncChatListener
 import dev.slne.surf.chat.bukkit.listener.ConnectListener
 import dev.slne.surf.chat.bukkit.listener.DisconnectListener
-import dev.slne.surf.chat.bukkit.listener.ServerResponseListener
 import dev.slne.surf.surfapi.bukkit.api.event.register
-import org.bukkit.Bukkit
 
 object BukkitListenerManager {
     fun registerBukkitListeners() {
         AsyncChatListener().register()
         DisconnectListener().register()
         ConnectListener().register()
-
-        Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "surf-chat:server_request")
-        Bukkit.getMessenger().registerIncomingPluginChannel(
-            plugin, "surf-chat:server_response",
-            ServerResponseListener()
-        );
     }
 
     fun registerPacketListeners() {

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/server/ChatGroup.kt

@@ -3,7 +3,6 @@ package dev.slne.surf.chat.bukkit
 import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
 import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.chat.api.processor.chatProcessorRegistry
-import dev.slne.surf.chat.api.server.ChatServer
 import dev.slne.surf.chat.bukkit.config.AiModerationConfig
 import dev.slne.surf.chat.bukkit.config.DiscordConfigProvider
 import dev.slne.surf.chat.bukkit.config.SurfChatConfigProvider
@@ -14,6 +13,7 @@ import dev.slne.surf.chat.bukkit.processor.pre.validate.CharPreChatProcessor
 import dev.slne.surf.chat.bukkit.processor.pre.validate.LinkPreChatProcessor
 import dev.slne.surf.chat.bukkit.processor.pre.validate.SpamPreChatProcessor
 import dev.slne.surf.chat.core.service.*
+import dev.slne.surf.core.api.common.surfCoreApi
 import kotlinx.coroutines.runBlocking
 import org.bukkit.plugin.java.JavaPlugin
 
@@ -47,7 +47,7 @@ class BukkitMain : SuspendingJavaPlugin() {
         launch {
             denylistService.fetch()
             denylistActionService.fetchActions()
-            functionalityService.fetch(server)
+            functionalityService.fetch(surfCoreApi.getCurrentServerName())
         }
         redisLoader.connect()
     }
@@ -70,12 +70,6 @@ class BukkitMain : SuspendingJavaPlugin() {
     val discordConfig = DiscordConfigProvider()
     val connectionMessageConfig get() = surfChatConfig.config.connectionMessageConfig
     val chatMotdConfig get() = surfChatConfig.config.chatMotdConfig
-    val chatServerConfig get() = surfChatConfig.config.chatServerConfig
     val autoDisablingConfig get() = surfChatConfig.config.autoDisablingConfig
     val spamConfig get() = surfChatConfig.config.spamConfig
-
-    var server = ChatServer.of(
-        chatServerConfig.internalName,
-        chatServerConfig.displayName
-    )
 }

surf-chat-api/src/main/kotlin/dev/slne/surf/chat/api/server/ChatServer.kt

@@ -17,6 +17,7 @@ import dev.slne.surf.chat.bukkit.redis.response.DirectMessageResponse
 import dev.slne.surf.chat.bukkit.redisApi
 import dev.slne.surf.chat.bukkit.util.toUserOrThrow
 import dev.slne.surf.chat.core.service.userService
+import dev.slne.surf.core.api.common.surfCoreApi
 import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
 import dev.slne.surf.surfapi.core.api.util.mutableObjectSetOf
 import net.kyori.adventure.text.Component
@@ -57,7 +58,7 @@ fun directMessageCommand() = commandAPICommand("msg") {
                 player.toUserOrThrow(),
                 targetUser,
                 sentAt,
-                plugin.server,
+                surfCoreApi.getCurrentServerName(),
                 null,
                 null,
                 MessageType.DIRECT