同步 satori 更新

Author: Yurn

adapter/src/commonMain/kotlin/cn/yurn/yutori/module/satori/adapter/ActionService.kt

@@ -57,7 +57,7 @@ class SatoriActionService(
         resource: String,
         method: String,
         platform: String?,
-        selfId: String?,
+        userId: String?,
         content: Map<String, Any?>
     ): Any = HttpClient {
         install(ContentNegotiation) {
@@ -80,8 +80,8 @@ class SatoriActionService(
                         "Bearer ${properties.token}"
                     )
                 }
-                platform?.let { append("X-Platform", platform) }
-                selfId?.let { append("X-Self-ID", selfId) }
+                platform?.let { append("Satori-Platform", platform) }
+                userId?.let { append("Satori-User-ID", userId) }
             }
             setBody(content.entries.filter { it.value != null }
                 .joinToString(",", "{", "}") { (key, value) ->
@@ -198,7 +198,7 @@ class SatoriActionService(
         resource: String,
         method: String,
         platform: String,
-        selfId: String,
+        userId: String,
         content: List<FormData>
     ): Map<String, String> =
         HttpClient {
@@ -219,8 +219,8 @@ class SatoriActionService(
                             "Bearer ${properties.token}"
                         )
                     }
-                    append("X-Platform", platform)
-                    append("X-Self-ID", selfId)
+                    append("Satori-Platform", platform)
+                    append("Satori-User-ID", userId)
                 }
             }.buildString()
             val formData = formData {

adapter/src/commonMain/kotlin/cn/yurn/yutori/module/satori/adapter/EventService.kt

@@ -95,7 +95,7 @@ class WebSocketEventService(
                                         for (login in signal.body.logins) {
                                             val actions = RootActions(
                                                 platform = login.platform!!,
-                                                selfId = login.selfId!!,
+                                                userId = login.user!!.id,
                                                 service = service,
                                                 yutori = yutori
                                             )
@@ -165,11 +165,11 @@ class WebSocketEventService(
             Logger.d(name) { "事件详细信息: $event" }
             sequence = event.id
             val actions = actionsList.find {
-                    actions -> actions.platform == event.platform && actions.selfId == event.selfId
+                    actions -> actions.platform == event.platform && actions.userId == event.selfId
             } ?: run {
                 val actions = RootActions(
                     platform = event.platform,
-                    selfId = event.selfId,
+                    userId = event.selfId,
                     service = service,
                     yutori = yutori
                 )

core/src/commonMain/kotlin/cn/yurn/yutori/module/satori/Entity.kt

@@ -255,30 +255,29 @@ data class SerializableGuild(
 
 @Serializable
 data class SerializableLogin(
-    val user: SerializableUser? = null,
-    @SerialName("self_id")
-    val selfId: String? = null,
+    val adapter: String,
     val platform: String? = null,
-    val status: Int,
+    val user: SerializableUser? = null,
+    val status: Int? = null,
     val features: List<String> = listOf(),
     @SerialName("proxy_urls")
     val proxyUrls: List<String> = listOf(),
 ) : Convertable<Login> {
     override fun toUniverse(yutori: Yutori) = Login(
-        user = user?.toUniverse(yutori),
-        selfId = selfId,
+        adapter = adapter,
         platform = platform,
+        user = user?.toUniverse(yutori),
         status = status,
         features = features,
         proxyUrls = proxyUrls
     )
 
     companion object {
         fun fromUniverse(universe: Login) = SerializableLogin(
-            user = universe.user?.let { SerializableUser.fromUniverse(it) },
-            selfId = universe.selfId,
+            adapter = universe.adapter,
             platform = universe.platform,
-            status = universe.status.toInt(),
+            user = universe.user?.let { SerializableUser.fromUniverse(it) },
+            status = universe.status?.toInt(),
             features = universe.features,
             proxyUrls = universe.proxyUrls
         )

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ agp = "8.6.1"
 atomicfu = "0.25.0"
 ktor = "3.0.0-rc-1"
 ksoup = "0.1.9"
-yutori = "3fcccaa1166fb9a63874bcff382170e98cc180d8"
+yutori = "dae7ab90aa9b5e3b3ee88a5900635c3fd4b83e83"
 
 [libraries]
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }

server/src/commonMain/kotlin/cn/yurn/yutori/module/satori/server/ServerService.kt

@@ -139,10 +139,10 @@ class SatoriServerService(
                         post("${properties.path}/${properties.version}/{api}") {
                             val address = call.request.local.remoteAddress
                             val api = "/" + call.pathParameters["api"]!!
-                            val platform = call.request.headers["X-Platform"]
-                            val selfId = call.request.headers["X-Self-ID"]
+                            val platform = call.request.headers["Satori-Platform"]
+                            val userId = call.request.headers["Satori-User-ID"]
                             val content = call.receiveText()
-                            Logger.i(name) { "Action($address): $api($platform, $selfId), $content" }
+                            Logger.i(name) { "Action($address): $api($platform, $userId), $content" }
                             val token = call.request.headers["Authorization"]
                             if (token == null) {
                                 call.respond(HttpStatusCode.Unauthorized)
@@ -159,8 +159,8 @@ class SatoriServerService(
                                 yutori.actionsList,
                                 Request(
                                     api, mutableMapOf(
-                                        "platform" to platform,
-                                        "selfId" to selfId,
+                                        "satoriPlatform" to platform,
+                                        "satoriUserId" to userId,
                                         "channelId" to element.remove("channel_id")?.jsonPrimitive?.content,
                                         "guildId" to element.remove("guild_id")?.jsonPrimitive?.content,
                                         "next" to element.remove("next")?.jsonPrimitive?.content,