chore(deps): bump types to 1.2.0-RC3.1

Author: Aliorpse

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ kotlin = "2.3.10"
 coroutines = "1.10.2"
 serialization = "1.10.0"
 ktor = "3.4.1"
-milky = "1.2.0-RC3"
+milky = "1.2.0-RC3.1"
 logback = "1.5.32"
 
 maven-publish = "0.36.0"

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/core/SaltifyApplication.kt

@@ -247,10 +247,10 @@ private fun SaltifyApplication.startLoggingListeners() = applicationScope.launch
                     when (val data = it.data) {
                         is IncomingMessage.Group ->
                             logger.debug(
-                                "${data.groupMember.userId}(${data.group.groupId}): ${data.segments.plainText}"
+                                "${data.groupMember.userId}(${data.group.groupId}): ${it.segments.plainText}"
                             )
                         else ->
-                            logger.debug("${data.peerId}: ${data.segments.plainText}")
+                            logger.debug("${it.peerId}: ${it.segments.plainText}")
                     }
                 }
                 else -> {}

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/SaltifyCommandContext.kt

@@ -144,15 +144,13 @@ public class SaltifyCommandExecutionContext(
 
         return withTimeoutOrNull(timeout) {
             messageFlow.first { nextEvent ->
-                val nextData = nextEvent.data
-
                 when (val contextData = event.data) {
                     is IncomingMessage.Group -> {
-                        nextData is IncomingMessage.Group &&
-                            nextData.group.groupId == contextData.group.groupId &&
-                            nextData.senderId == contextData.senderId
+                        nextEvent.data is IncomingMessage.Group &&
+                            (nextEvent.data as IncomingMessage.Group).group.groupId == contextData.group.groupId &&
+                            nextEvent.senderId == event.senderId
                     }
-                    else -> nextData.senderId == contextData.senderId
+                    else -> nextEvent.senderId == event.senderId
                 }
             }
         }

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/dsl/SaltifyPluginContext.kt

@@ -90,8 +90,8 @@ public class SaltifyPluginContext internal constructor(
         val output = respond(block)
         delay(delay)
         when (data) {
-            is IncomingMessage.Group -> client.recallGroupMessage(data.peerId, output.messageSeq)
-            else -> client.recallPrivateMessage(data.peerId, output.messageSeq)
+            is IncomingMessage.Group -> client.recallGroupMessage(peerId, output.messageSeq)
+            else -> client.recallPrivateMessage(peerId, output.messageSeq)
         }
     }
 }

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/ApplicationExtension.kt

@@ -44,7 +44,7 @@ public inline fun SaltifyApplication.regex(
     val regex = Regex(regex)
 
     return on<Event.MessageReceive>(scope) { event ->
-        val text = event.data.segments.plainText
+        val text = event.segments.plainText
 
         val matches = regex.findAll(text)
         if (matches.any()) block(event, matches)
@@ -65,8 +65,8 @@ public fun SaltifyApplication.command(
     val rootDsl = SaltifyCommandContext().apply(builder)
 
     return on<Event.MessageReceive>(scope) { event ->
-        val rawText = event.data.segments.filterIsInstance<IncomingSegment.Text>()
-            .joinToString("") { it.data.text }
+        val rawText = event.segments.filterIsInstance<IncomingSegment.Text>()
+            .joinToString("") { it.text }
             .trim()
 
         if (rawText != "$prefix$name" && !rawText.startsWith("$prefix$name ")) return@on
@@ -132,14 +132,14 @@ private suspend fun executeCommand(
     }
 
     val startInstant = Clock.System.now()
-    execution.logger.info("${event.data.peerId} 触发了 $name 指令 (seq=${event.data.messageSeq})")
+    execution.logger.info("${event.peerId} 触发了 $name 指令 (seq=${event.messageSeq})")
 
     when (event.data) {
         is IncomingMessage.Group -> dsl.groupExecutionBlock ?: dsl.executionBlock
         else -> dsl.privateExecutionBlock ?: dsl.executionBlock
     }?.invoke(execution)
 
-    execution.logger.info("seq=${event.data.messageSeq} 处理完成, 用时 ${Clock.System.now() - startInstant}")
+    execution.logger.info("seq=${event.messageSeq} 处理完成, 用时 ${Clock.System.now() - startInstant}")
 }
 
 @Suppress("UNCHECKED_CAST")

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/EventExtension.kt

@@ -15,13 +15,13 @@ import org.ntqqrev.saltify.model.milky.SendMessageOutput
 public suspend fun Event.MessageReceive.respond(
     client: SaltifyApplication,
     block: MutableList<OutgoingSegment>.() -> Unit
-): SendMessageOutput = when (val data = this.data) {
+): SendMessageOutput = when (data) {
     is IncomingMessage.Group -> {
-        val output = client.sendGroupMessage(data.peerId, block)
+        val output = client.sendGroupMessage(peerId, block)
         SendMessageOutput(output.messageSeq, output.time)
     }
     else -> {
-        val output = client.sendPrivateMessage(data.peerId, block)
+        val output = client.sendPrivateMessage(peerId, block)
         SendMessageOutput(output.messageSeq, output.time)
     }
 }

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/IncomingMessageExtension.kt

@@ -8,13 +8,13 @@ import org.ntqqrev.milky.IncomingSegment
 public val List<IncomingSegment>.plainText: String
     get() = joinToString("") { segment ->
         when (segment) {
-            is IncomingSegment.Text -> segment.data.text
+            is IncomingSegment.Text -> segment.text
             is IncomingSegment.Face -> "[表情]"
             is IncomingSegment.Image -> "[图片]"
             is IncomingSegment.Record -> "[语音]"
             is IncomingSegment.Video -> "[视频]"
             is IncomingSegment.File -> "[文件]"
-            is IncomingSegment.Mention -> "@${segment.data.name}"
+            is IncomingSegment.Mention -> "@${segment.name}"
             is IncomingSegment.MentionAll -> "@全体成员"
             is IncomingSegment.Reply -> "[回复]"
             is IncomingSegment.Forward -> "[合并转发]"

saltify-core/src/jvmTest/kotlin/org/ntqqrev/saltify/PluginTest.kt

@@ -99,7 +99,7 @@ class PluginTest {
                 if (event == null) {
                     respond { text("Operation cancelled due to timeout") }
                 } else {
-                    val content = event.data.segments.plainText
+                    val content = event.segments.plainText
                     respond {
                         text("You just responded \"$content\". However, whatever you say I won't shutdown myself.")
                     }

saltify-docs/content/guide/logging.md

@@ -53,7 +53,7 @@ val myPlugin = SaltifyPlugin("my-plugin", ::Config) { config ->
     }
 
     on<Event.MessageReceive> {
-        logger.debug("收到消息: ${it.data.segments.plainText}")
+        logger.debug("收到消息: ${it.segments.plainText}")
     }
 
     command("test") {

saltify-docs/content/quick-tour.md

@@ -67,7 +67,7 @@ val myPlugin = SaltifyPlugin("my-plugin") {
     }
 
     on<Event.GroupMemberIncrease> { event ->
-        println("新成员加入: ${event.data.userId}")
+        println("新成员加入: ${event.userId}")
     }
 }