Merge pull request #15 from simple-robot/dev/fix-14

修复 TelegramMessageEntity$Simple 的多态序列化注册错误
simple-robot · Jul 18, 2024 · 7661553 · 7661553
2 parents ceabed8 + f25fc9e
commit 7661553
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -40,8 +40,8 @@ object P {
         override val description: String get() = DESCRIPTION
         override val homepage: String get() = HOMEPAGE
 
-        const val VERSION = "0.0.5"
-        const val NEXT_VERSION = "0.0.6"
+        const val VERSION = "0.0.6"
+        const val NEXT_VERSION = "0.0.7"
 
         override val snapshotVersion = "$NEXT_VERSION-SNAPSHOT"
         override val version = if (isSnapshot()) snapshotVersion else VERSION

diff --git a/...in/telegram/internal/processors/includemessageelements/IncludeMessageElementsProcessor.kt b/...in/telegram/internal/processors/includemessageelements/IncludeMessageElementsProcessor.kt
@@ -25,6 +25,7 @@ import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.processing.SymbolProcessorProvider
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
+import com.google.devtools.ksp.symbol.Modifier
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.ksp.toClassName
@@ -81,6 +82,8 @@ private class IncludeMessageElementsProcessor(val environment: SymbolProcessorEn
             .filterIsInstance<KSClassDeclaration>()
             // 是一个可序列化的具体的类
             .filter { !it.isAbstract() }
+            // isAbstract 无法判断 sealed
+            .filter { Modifier.SEALED !in it.modifiers }
             // 是 BaseMessageElement 的子类
             .filter { baseDeclarationType.isAssignableFrom(it.asStarProjectedType()) }
             .onEach {

diff --git a/...monMain/kotlin/love/forte/simbot/component/telegram/core/message/TelegramMessageEntity.kt b/...monMain/kotlin/love/forte/simbot/component/telegram/core/message/TelegramMessageEntity.kt
@@ -158,9 +158,12 @@ public sealed class TelegramMessageEntity : TelegramMessageElement, PlainText {
     @SerialName("telegram.m.message_entity.simple")
     public class Simple internal constructor(
         override val text: String,
-        override val type: String,
+        private val typeValue: String,
         override val sourceEntity: MessageEntity?
-    ) : TelegramMessageEntity()
+    ) : TelegramMessageEntity() {
+        override val type: String
+            get() = typeValue
+    }
 
     /**
      * An implementation with type [MessageEntityType.TEXT_LINK]

diff --git a/...n/love/forte/simbot/component/telegram/core/message/internal/ReceivingMessageResolvers.kt b/...n/love/forte/simbot/component/telegram/core/message/internal/ReceivingMessageResolvers.kt
@@ -93,7 +93,7 @@ internal fun StdlibMessage.toMessages(): Messages {
                 else -> {
                     TelegramMessageEntity.Simple(
                         text = text.substring(entity),
-                        type = entity.type,
+                        typeValue = entity.type,
                         entity
                     )
                 }