shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
Simplxs 2024-03-24 05:33:57 +08:00
parent ad313f384c
commit cdc664f44a
No known key found for this signature in database
GPG Key ID: E23537FF14DD6507
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xposed/src/main/java/kritor/service/ForwardMessageService.kt
View File

@ -37,7 +37,7 @@ internal object ForwardMessageService : ForwardMessageServiceGrpcKt.ForwardMessa
}.getOrThrow() }.getOrThrow()
return UploadForwardMessageResponse.newBuilder().apply { return UploadForwardMessageResponse.newBuilder().apply {
this.resId = forwardMessage.id this.resId = forwardMessage.resId
}.build() }.build()
} }

9
xposed/src/main/java/kritor/service/MessageService.kt
View File

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

2
xposed/src/main/java/qq/service/msg/ForwardMessageHelper.kt
View File

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

2
xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt
View File

@ -839,7 +839,7 @@ object NtMsgConvertor {
} }
private suspend fun forwardConvertor(contact: Contact, msgId: Long, sourceForward: Element): Result<MsgElement> { 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 val filename = sourceForward.forward.uniseq
var summary = sourceForward.forward.summary var summary = sourceForward.forward.summary
val descriptions = sourceForward.forward.description val descriptions = sourceForward.forward.description