Merge branch 'main' into seal-on-main

Wesley-Young · Wesley-Young · commit 3af4b6c3b0a0 · 2026-05-19T19:03:11.000+08:00
# Conflicts:
#	acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/WebSocket.kt
#	yogurt/src/commonMain/kotlin/org/ntqqrev/yogurt/scripting/Configure.kt
diff --git a/acidify-core/build.gradle.kts b/acidify-core/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
 }
 
 group = "org.ntqqrev"
-version = "1.6.0"
+version = "1.6.1"
 
 kotlin {
     js(IR) {
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/BotIncomingSegment.kt b/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/BotIncomingSegment.kt
@@ -20,10 +20,12 @@ sealed class BotIncomingSegment {
     /**
      * 提及（At）消息段
      * @property uin 被提及的用户的 QQ 号，为 `null` 表示提及了所有人（`@全体成员`）
+     * @property uid 被提及的用户的 UID，为 `null` 表示提及了所有人（`@全体成员`）
      * @property name 被提及的用户的名称，视情况有可能是昵称 / 备注 / 群名片 / `@全体成员`
      */
     data class Mention internal constructor(
         val uin: Long? = null,
+        val uid: String? = null,
         val name: String,
     ) : BotIncomingSegment() {
         override fun toString(): String = name // already prefixed with '@'
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/internal/IncomingSegmentFactory.kt b/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/message/internal/IncomingSegmentFactory.kt
@@ -66,10 +66,21 @@ internal interface IncomingSegmentFactory<T : BotIncomingSegment> {
                 ?: return null
             ctx.consume()
             val attr = at.pbReserve.pbDecode<TextResvAttr>()
-            return BotIncomingSegment.Mention(
-                uin = attr.atMemberUin,
-                name = at.textMsg
-            )
+            return when (attr.atType) {
+                1 -> BotIncomingSegment.Mention( // Mention all
+                    uin = null,
+                    uid = null,
+                    name = at.textMsg
+                )
+
+                2 -> BotIncomingSegment.Mention( // specific user
+                    uin = attr.atMemberUin,
+                    uid = attr.atMemberUid,
+                    name = at.textMsg
+                )
+
+                else -> null
+            }
         }
     }
 
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/api/HttpRoutes.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/api/HttpRoutes.kt
@@ -1,14 +1,12 @@
 package org.ntqqrev.acidify.milky.api
 
 import io.ktor.server.plugins.*
-import io.ktor.server.plugins.di.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
-import org.ntqqrev.acidify.AbstractBot
 import org.ntqqrev.acidify.exception.OidbException
 import org.ntqqrev.acidify.exception.ServiceException
 import org.ntqqrev.acidify.milky.MediaSourceScope
@@ -32,8 +30,7 @@ inline fun <reified T : Any, reified R : Any> ApiEndpoint<T, R>.define(
 
 context(ctx: MilkyContext)
 private fun <T : Any, R : Any> Route.serve(handler: MilkyApiHandler<T, R>) = post(handler.path) {
-    val bot = application.dependencies.resolve<AbstractBot>()
-    val logger = bot.createLogger("HttpModule")
+    val logger = ctx.bot.createLogger("HttpModule")
     try {
         val rawPayload = call.receive<JsonElement>()
         call.respond(
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/SSE.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/SSE.kt
@@ -1,17 +1,14 @@
 package org.ntqqrev.acidify.milky.event
 
-import io.ktor.server.plugins.di.*
 import io.ktor.server.routing.*
 import io.ktor.server.sse.*
 import kotlinx.coroutines.launch
-import org.ntqqrev.acidify.AbstractBot
 import org.ntqqrev.acidify.milky.MilkyContext
 import org.ntqqrev.milky.milkyJsonModule
 
 context(ctx: MilkyContext)
 fun Route.eventSse() = sse {
-    val bot = application.dependencies.resolve<AbstractBot>()
-    val logger = bot.createLogger("SseModule")
+    val logger = ctx.bot.createLogger("SseModule")
     logger.i { "${call.request.local.remoteAddress} 通过 SSE 连接" }
     launch {
         ctx.eventFlow.collect {
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/WebSocket.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/WebSocket.kt
@@ -1,19 +1,15 @@
 package org.ntqqrev.acidify.milky.event
 
-import io.ktor.server.plugins.di.*
 import io.ktor.server.routing.*
-import io.ktor.server.routing.application
-import io.ktor.server.websocket.sendSerialized
+import io.ktor.server.websocket.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.launch
-import org.ntqqrev.acidify.AbstractBot
 import org.ntqqrev.acidify.milky.MilkyContext
 import org.ntqqrev.acidify.milky.internal.webSocketPolyfill
 
 context(ctx: MilkyContext)
 fun Route.eventWebSocket() = webSocketPolyfill {
-    val bot = application.dependencies.resolve<AbstractBot>()
-    val logger = bot.createLogger("WebSocketModule")
+    val logger = ctx.bot.createLogger("WebSocketModule")
     logger.i { "${call.request.local.remoteAddress} 通过 WebSocket 连接" }
     launch {
         ctx.eventFlow.collect(::sendSerialized)
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/Webhook.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/event/Webhook.kt
@@ -6,9 +6,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
-import io.ktor.server.plugins.di.*
 import kotlinx.coroutines.launch
-import org.ntqqrev.acidify.AbstractBot
 import org.ntqqrev.acidify.milky.MilkyContext
 import org.ntqqrev.milky.milkyJsonModule
 
@@ -21,8 +19,7 @@ val webhookClient = HttpClient {
 context(ctx: MilkyContext)
 fun Application.eventWebhook() = monitor.subscribe(ApplicationStarted) {
     this.launch {
-        val bot = dependencies.resolve<AbstractBot>()
-        val logger = bot.createLogger("WebhookModule")
+        val logger = ctx.bot.createLogger("WebhookModule")
         ctx.eventFlow.collect {
             ctx.webhookEndpoints.forEach { webhook ->
                 launch {
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/transform/EventTransform.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/transform/EventTransform.kt
@@ -1,15 +1,12 @@
 package org.ntqqrev.acidify.milky.transform
 
-import io.ktor.server.plugins.di.*
-import org.ntqqrev.acidify.AbstractBot
 import org.ntqqrev.acidify.event.*
 import org.ntqqrev.acidify.message.MessageScene
 import org.ntqqrev.acidify.milky.MilkyContext
 import org.ntqqrev.milky.Event
 import kotlin.time.Clock
 
 suspend fun MilkyContext.transformAcidifyEvent(event: AcidifyEvent): Event? {
-    val bot = application.dependencies.resolve<AbstractBot>()
     return when (event) {
         is BotOfflineEvent -> Event.BotOffline(
             time = Clock.System.now().epochSeconds,
diff --git a/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/transform/MessageTransform.kt b/acidify-milky/src/commonMain/kotlin/org/ntqqrev/acidify/milky/transform/MessageTransform.kt
@@ -3,11 +3,8 @@ package org.ntqqrev.acidify.milky.transform
 import io.ktor.server.plugins.di.*
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
-import org.ntqqrev.acidify.AbstractBot
+import org.ntqqrev.acidify.*
 import org.ntqqrev.acidify.common.MediaSource.Companion.toMediaSource
-import org.ntqqrev.acidify.getDownloadUrl
-import org.ntqqrev.acidify.getFriend
-import org.ntqqrev.acidify.getGroup
 import org.ntqqrev.acidify.message.*
 import org.ntqqrev.acidify.milky.ImageInfo
 import org.ntqqrev.acidify.milky.MediaSourceScope
@@ -17,7 +14,6 @@ import org.ntqqrev.milky.*
 import kotlin.time.Clock
 
 suspend fun MilkyContext.transformIncomingMessage(msg: BotIncomingMessage): IncomingMessage? {
-    val bot = application.dependencies.resolve<AbstractBot>()
     return when (msg.scene) {
         MessageScene.FRIEND -> {
             val friend = bot.getFriend(msg.peerUin) ?: return null
@@ -66,7 +62,6 @@ suspend fun MilkyContext.transformForwardedMessage(msg: BotForwardedMessage): In
 }
 
 suspend fun MilkyContext.transformIncomingSegment(segment: BotIncomingSegment): IncomingSegment {
-    val bot = application.dependencies.resolve<AbstractBot>()
     return when (segment) {
         is BotIncomingSegment.Text -> IncomingSegment.Text(
             data = IncomingSegment.Text.Data(
@@ -77,7 +72,9 @@ suspend fun MilkyContext.transformIncomingSegment(segment: BotIncomingSegment):
         is BotIncomingSegment.Mention -> if (segment.uin != null) {
             IncomingSegment.Mention(
                 data = IncomingSegment.Mention.Data(
-                    userId = segment.uin!!,
+                    userId = if (segment.uin == 0L) {
+                        bot.getUinByUid(segment.uid!!)
+                    } else segment.uin!!,
                     name = segment.name,
                 )
             )
@@ -184,7 +181,6 @@ suspend fun MilkyContext.transformOutgoingSegment(
     peerUin: Long,
     segment: OutgoingSegment,
 ): BotOutgoingSegment {
-    val bot = application.dependencies.resolve<AbstractBot>()
     val logger = bot.createLogger("MessageTransform")
     return when (segment) {
         is OutgoingSegment.Text -> BotOutgoingSegment.Text(
@@ -323,7 +319,6 @@ suspend fun MilkyContext.transformEssenceMessage(msg: BotEssenceMessage): GroupE
 
 context(scope: MediaSourceScope)
 suspend fun MilkyContext.transformEssenceSegment(segment: BotEssenceSegment): IncomingSegment {
-    val bot = application.dependencies.resolve<AbstractBot>()
     val logger = bot.createLogger("MessageTransform")
     return when (segment) {
         is BotEssenceSegment.Text -> IncomingSegment.Text(

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`group = "org.ntqqrev"`
`18`		`-version = "1.6.0"`
	`18`	`+version = "1.6.1"`
`19`	`19`
`20`	`20`	`kotlin {`
`21`	`21`	`js(IR) {`