Update to InterChat 2.8.0

Author: acrylic-style

build.gradle.kts

@@ -22,9 +22,7 @@ dependencies {
     implementation("org.mariadb.jdbc:mariadb-java-client:3.0.8")
     implementation("com.zaxxer:HikariCP:5.0.1")
     implementation("com.charleskorn.kaml:kaml:0.47.0") // YAML support for kotlinx.serialization
-    implementation("net.azisaba.interchat:api:2.4.1-SNAPSHOT")
-    // ByteBuf
-    implementation("io.netty:netty-buffer:4.1.82.Final")
+    implementation("net.azisaba.interchat:api:2.8.0-SNAPSHOT")
     // Support for minecraft chat components
     implementation("net.kyori:adventure-api:$adventureVersion")
     implementation("net.kyori:adventure-text-serializer-legacy:$adventureVersion")

src/main/kotlin/net/azisaba/guildchatdiscord/InterChatPacketListener.kt

@@ -6,8 +6,11 @@ import dev.kord.rest.request.RestRequestException
 import dev.kord.rest.service.RestClient
 import kotlinx.coroutines.runBlocking
 import net.azisaba.guildchatdiscord.util.DatabaseManager
+import net.azisaba.interchat.api.data.PlayerPosData
+import net.azisaba.interchat.api.data.SenderInfo
 import net.azisaba.interchat.api.guild.GuildMember
 import net.azisaba.interchat.api.network.PacketListener
+import net.azisaba.interchat.api.network.RedisKeys
 import net.azisaba.interchat.api.network.protocol.GuildMessagePacket
 import net.azisaba.interchat.api.text.MessageFormatter
 import net.azisaba.interchat.api.util.AsyncUtil
@@ -32,12 +35,16 @@ object InterChatPacketListener : PacketListener {
             }
             val members = guild.members.join()
             val nickname = members.stream().filter { it.uuid() == user.id() }.findAny().map(GuildMember::nickname)
+            val pos = try {
+                JedisBoxProvider.get()[RedisKeys.azisabaReportPlayerPos(user.id()), PlayerPosData.NETWORK_CODEC, 1000].toWorldPos()
+            } catch (_: Exception) {
+                null
+            }
+            val senderInfo = SenderInfo(user, packet.server(), nickname.orElse(null), pos)
             val formattedText = MessageFormatter.format(
                 guild.format(),
                 guild,
-                packet.server(),
-                user,
-                nickname.orElse(null),
+                senderInfo,
                 packet.message(),
                 packet.transliteratedMessage(),
                 emptyMap(), // TODO: support prefix and suffix

src/main/kotlin/net/azisaba/guildchatdiscord/commands/NickCommand.kt

@@ -26,7 +26,7 @@ object NickCommand : CommandHandler {
             return
         }
         val oldMember = guild.getMember(uuid).join()
-        val newMember = GuildMember(oldMember.guildId(), oldMember.uuid(), oldMember.role(), newName)
+        val newMember = GuildMember(oldMember.guildId(), oldMember.uuid(), oldMember.role(), newName, oldMember.hiddenByMember())
         newMember.update()
         interaction.respondEphemeral { content = "ニックネームを `$newName` に変更しました。" }
     }

src/main/kotlin/net/azisaba/guildchatdiscord/util/DatabaseManager.kt

@@ -3,12 +3,21 @@ package net.azisaba.guildchatdiscord.util
 import net.azisaba.guildchatdiscord.BotConfig
 import net.azisaba.interchat.api.util.Functions
 import net.azisaba.interchat.api.util.QueryExecutor
+import net.azisaba.interchat.api.util.SQLThrowableConsumer
 import org.intellij.lang.annotations.Language
 import java.sql.PreparedStatement
+import java.sql.Statement
 import java.util.UUID
 
 object DatabaseManager {
-    val interChatQueryExecutor = QueryExecutor { sql, action -> queryInterChat(sql) { stmt -> action.accept(stmt) } }
+    val interChatQueryExecutor = object : QueryExecutor {
+        override fun query(sql: String, action: SQLThrowableConsumer<PreparedStatement>) {
+        }
+
+        override fun queryWithGeneratedKeys(sql: String, action: SQLThrowableConsumer<PreparedStatement>) {
+            queryInterChat(sql, true) { stmt -> action.accept(stmt) }
+        }
+    }
     val dataSource = BotConfig.instance.database.createDataSource()
     private val interChatDataSource = BotConfig.instance.interChatDatabase.createDataSource()
 
@@ -89,9 +98,13 @@ object DatabaseManager {
         interChatDataSource.close()
     }
 
-    private inline fun queryInterChat(@Language("SQL") sql: String, block: (PreparedStatement) -> Unit) {
+    private inline fun queryInterChat(@Language("SQL") sql: String, withGeneratedKeys: Boolean = false, block: (PreparedStatement) -> Unit) {
         interChatDataSource.connection.use { connection ->
-            connection.prepareStatement(sql).use(block)
+            if (withGeneratedKeys) {
+                connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS).use(block)
+            } else {
+                connection.prepareStatement(sql).use(block)
+            }
         }
     }
 }