fix build error

whitechi73 · Mar 23, 2024 · cdc664f · cdc664f
1 parent ad313f3
commit cdc664f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/xposed/src/main/java/kritor/service/ForwardMessageService.kt b/xposed/src/main/java/kritor/service/ForwardMessageService.kt
@@ -37,7 +37,7 @@ internal object ForwardMessageService : ForwardMessageServiceGrpcKt.ForwardMessa
         }.getOrThrow()
 
         return UploadForwardMessageResponse.newBuilder().apply {
-            this.resId = forwardMessage.id
+            this.resId = forwardMessage.resId
         }.build()
     }
 

diff --git a/xposed/src/main/java/kritor/service/MessageService.kt b/xposed/src/main/java/kritor/service/MessageService.kt
@@ -14,12 +14,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import protobuf.auto.toByteArray
-import protobuf.message.ContentHead
-import protobuf.message.Elem
-import protobuf.message.MsgBody
-import protobuf.message.PbSendMsgReq
-import protobuf.message.RichText
-import protobuf.message.RoutingHead
+import protobuf.message.*
 import protobuf.message.element.GeneralFlags
 import protobuf.message.routing.C2C
 import protobuf.message.routing.Grp
@@ -28,9 +23,7 @@ import qq.service.contact.longPeer
 import qq.service.internals.NTServiceFetcher
 import qq.service.msg.MessageHelper
 import qq.service.msg.NtMsgConvertor
-import qq.service.msg.toKritorEventMessages
 import qq.service.msg.toKritorReqMessages
-import qq.service.msg.toKritorResponseMessages
 import kotlin.coroutines.resume
 import kotlin.random.Random
 import kotlin.random.nextUInt

diff --git a/xposed/src/main/java/qq/service/msg/ForwardMessageHelper.kt b/xposed/src/main/java/qq/service/msg/ForwardMessageHelper.kt
@@ -227,7 +227,7 @@ internal object ForwardMessageHelper : QQInterfaces() {
         val resId = rsp.sendResult?.resId ?: return Result.failure(Exception("unable to upload multi message"))
 
         return Result.success(ForwardElement.newBuilder().apply {
-            this.id = resId
+            this.resId = resId
             this.summary = summary
             this.uniseq = UUID.randomUUID().toString()
             this.description = desc.slice(0..if (i < 3) i else 3).joinToString("\n")

diff --git a/xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt b/xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt
@@ -839,7 +839,7 @@ object NtMsgConvertor {
     }
 
     private suspend fun forwardConvertor(contact: Contact, msgId: Long, sourceForward: Element): Result<MsgElement> {
-        val resId = sourceForward.forward.id
+        val resId = sourceForward.forward.resId
         val filename = sourceForward.forward.uniseq
         var summary = sourceForward.forward.summary
         val descriptions = sourceForward.forward.description