fix https://github.com/KarinJS/kritor/issues/10

xposed/src/main/java/kritor/client/KritorClient.kt

@@ -2,8 +2,15 @@
 package kritor.client
 
 import com.google.protobuf.ByteString
+import io.grpc.CallOptions
+import io.grpc.Channel
+import io.grpc.ClientCall
+import io.grpc.ClientInterceptor
+import io.grpc.ForwardingClientCall
+import io.grpc.Metadata
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder
+import io.grpc.MethodDescriptor
 import io.kritor.common.Request
 import io.kritor.common.Response
 import io.kritor.event.EventServiceGrpcKt
@@ -23,6 +30,8 @@ import kritor.handlers.handleGrpc
 import moe.fuqiuluo.shamrock.helper.Level
 import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.internals.GlobalEventTransmitter
+import moe.fuqiuluo.shamrock.tools.ShamrockVersion
+import qq.service.ticket.TicketHelper
 import kotlin.time.Duration.Companion.seconds
 
 internal class KritorClient(
@@ -39,11 +48,26 @@ internal class KritorClient(
             if (::channel.isInitialized && isActive()){
                 channel.shutdown()
             }
+            val interceptor = object : ClientInterceptor {
+                override fun <ReqT, RespT> interceptCall(method: MethodDescriptor<ReqT, RespT>, callOptions: CallOptions, next: Channel): ClientCall<ReqT, RespT> {
+                    return object : ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+                        override fun start(responseListener: Listener<RespT>, headers: Metadata) {
+                            headers.merge(Metadata().apply {
+                                put(Metadata.Key.of("kritor-self-uin", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUin())
+                                put(Metadata.Key.of("kritor-self-uid", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUid())
+                                put(Metadata.Key.of("kritor-self-version", Metadata.ASCII_STRING_MARSHALLER), "OpenShamrock-$ShamrockVersion")
+                            })
+                            super.start(responseListener, headers)
+                        }
+                    }
+                }
+            }
             channel = ManagedChannelBuilder
                 .forAddress(host, port)
                 .usePlaintext()
                 .enableRetry() // 允许尝试
                 .executor(Dispatchers.IO.asExecutor()) // 使用协程的调度器
+                .intercept(interceptor)
                 .build()
         }.onFailure {
             LogCenter.log("KritorClient start failed: ${it.stackTraceToString()}", Level.ERROR)

xposed/src/main/java/kritor/server/KritorServer.kt

@@ -2,7 +2,12 @@
 package kritor.server
 
 import io.grpc.Grpc
+import io.grpc.Metadata
 import io.grpc.InsecureServerCredentials
+import io.grpc.ServerCall
+import io.grpc.ServerCallHandler
+import io.grpc.ServerInterceptor
+import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -10,14 +15,35 @@ import kotlinx.coroutines.asExecutor
 import kritor.auth.AuthInterceptor
 import kritor.service.*
 import moe.fuqiuluo.shamrock.helper.LogCenter
+import moe.fuqiuluo.shamrock.tools.ShamrockVersion
+import qq.service.ticket.TicketHelper
 import kotlin.coroutines.CoroutineContext
 
 class KritorServer(
     private val port: Int
 ): CoroutineScope {
+
+    private val serverInterceptor = object : ServerInterceptor {
+        override fun <ReqT, RespT> interceptCall(
+            call: ServerCall<ReqT, RespT>, headers: Metadata, next: ServerCallHandler<ReqT, RespT>
+        ): ServerCall.Listener<ReqT> {
+            return next.startCall(object : SimpleForwardingServerCall<ReqT, RespT>(call) {
+                override fun sendHeaders(headers: Metadata?) {
+                    headers?.apply {
+                        put(Metadata.Key.of("kritor-self-uin", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUin())
+                        put(Metadata.Key.of("kritor-self-uid", Metadata.ASCII_STRING_MARSHALLER), TicketHelper.getUid())
+                        put(Metadata.Key.of("kritor-self-version", Metadata.ASCII_STRING_MARSHALLER), "OpenShamrock-$ShamrockVersion")
+                    }
+                    super.sendHeaders(headers)
+                }
+            }, headers)
+        }
+    }
+
     private val server = Grpc.newServerBuilderForPort(port, InsecureServerCredentials.create())
         .executor(Dispatchers.IO.asExecutor())
         .intercept(AuthInterceptor)
+        .intercept(serverInterceptor)
         .addService(AuthenticationService)
         .addService(CoreService)
         .addService(FriendService)

xposed/src/main/java/kritor/service/DeveloperService.kt

@@ -2,12 +2,37 @@ package kritor.service
 
 import com.google.protobuf.ByteString
 import io.kritor.developer.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import moe.fuqiuluo.shamrock.utils.FileUtils
 import moe.fuqiuluo.shamrock.utils.MMKVFetcher
 import moe.fuqiuluo.shamrock.utils.PlatformUtils
 import qq.service.QQInterfaces
+import java.io.File
 
 internal object DeveloperService: DeveloperServiceGrpcKt.DeveloperServiceCoroutineImplBase() {
+    @Grpc("DeveloperService", "Shell")
+    override suspend fun shell(request: ShellRequest): ShellResponse {
+        if (request.commandList.isEmpty()) return ShellResponse.newBuilder().setIsSuccess(false).build()
+        val runtime = Runtime.getRuntime()
+        val result = withTimeoutOrNull(5000L) {
+            withContext(Dispatchers.IO) {
+                runtime.exec(request.commandList.toTypedArray(), null, File(request.directory)).apply { waitFor() }
+            }
+        }
+        return ShellResponse.newBuilder().apply {
+            if (result == null) {
+                isSuccess = false
+            } else {
+                isSuccess = true
+                result.inputStream.use {
+                    data = it.readBytes().toString(Charsets.UTF_8)
+                }
+            }
+        }.build()
+    }
+
     @Grpc("DeveloperService", "ClearCache")
     override suspend fun clearCache(request: ClearCacheRequest): ClearCacheResponse {
         FileUtils.clearCache()

xposed/src/main/java/kritor/service/FriendService.kt

@@ -225,8 +225,8 @@ internal object FriendService : FriendServiceGrpcKt.FriendServiceCoroutineImplBa
     }
 
     @Grpc("FriendService", "GetUidByUin")
-    override suspend fun getUidByUin(request: GetUidRequest): GetUidResponse {
-        return GetUidResponse.newBuilder().apply {
+    override suspend fun getUidByUin(request: GetUidByUinRequest): GetUidByUinResponse {
+        return GetUidByUinResponse.newBuilder().apply {
             request.targetUinsList.forEach {
                 putUidMap(it, ContactHelper.getUidByUinAsync(it))
             }

xposed/src/main/java/kritor/service/GroupService.kt

@@ -3,6 +3,7 @@ package kritor.service
 import io.grpc.Status
 import io.grpc.StatusRuntimeException
 import io.kritor.group.*
+import moe.fuqiuluo.shamrock.helper.LogCenter
 import moe.fuqiuluo.shamrock.helper.TroopHonorHelper.decodeHonor
 import moe.fuqiuluo.shamrock.tools.ifNullOrEmpty
 import qq.service.contact.ContactHelper
@@ -213,9 +214,10 @@ internal object GroupService : GroupServiceGrpcKt.GroupServiceCoroutineImplBase(
         return GetGroupListResponse.newBuilder().apply {
             groupList.forEach { groupInfo ->
                 this.addGroupsInfo(GroupInfo.newBuilder().apply {
-                    groupId = groupInfo.troopcode.toLong()
+                    groupId = groupInfo.troopcode.ifNullOrEmpty { groupInfo.uin }.ifNullOrEmpty { groupInfo.troopuin }?.toLong() ?: 0
                     groupName = groupInfo.troopname.ifNullOrEmpty { groupInfo.troopRemark }
-                        .ifNullOrEmpty { groupInfo.newTroopName } ?: ""
+                        .ifNullOrEmpty { groupInfo.newTroopName }
+                        ?: ""
                     groupRemark = groupInfo.troopRemark ?: ""
                     owner = groupInfo.troopowneruin?.toLong() ?: 0
                     addAllAdmins(GroupHelper.getAdminList(groupId))

xposed/src/main/java/kritor/service/MessageService.kt

@@ -463,7 +463,7 @@ internal object MessageService : MessageServiceGrpcKt.MessageServiceCoroutineImp
             request.contact.longPeer(),
             msg.msgSeq.toULong(),
             request.faceId.toString(),
-            request.isComment
+            request.isSet
         )
         return ReactMessageWithEmojiResponse.newBuilder().build()
     }

xposed/src/main/java/kritor/service/QsignService.kt

@@ -23,4 +23,11 @@ internal object QsignService: QsignServiceGrpcKt.QsignServiceCoroutineImplBase()
             this.result = ByteString.copyFrom(Dandelion.getInstance().fly(request.data, request.salt.toByteArray()))
         }.build()
     }
+
+    @Grpc("QsignService", "GetCmdWhitelist")
+    override suspend fun getCmdWhitelist(request: GetCmdWhitelistRequest): GetCmdWhitelistResponse {
+        return GetCmdWhitelistResponse.newBuilder().apply {
+            addAllCommands(FEKit.getInstance().cmdWhiteList)
+        }.build()
+    }
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/internals/GlobalEventTransmitter.kt

@@ -7,6 +7,7 @@ import com.tencent.qqnt.kernel.nativeinterface.MsgRecord
 import io.kritor.event.*
 import io.kritor.common.PushMessageBody
 import io.kritor.common.Contact
+import io.kritor.common.Scene
 import io.kritor.common.Sender
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
@@ -14,6 +15,7 @@ import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import qq.service.QQInterfaces
+import qq.service.contact.ContactHelper
 import qq.service.msg.toKritorEventMessages
 
 internal object GlobalEventTransmitter : QQInterfaces() {
@@ -24,12 +26,12 @@ internal object GlobalEventTransmitter : QQInterfaces() {
         MutableSharedFlow<NoticeEvent>()
     }
     private val requestEventFlow by lazy {
-        MutableSharedFlow<RequestsEvent>()
+        MutableSharedFlow<RequestEvent>()
     }
 
     private suspend fun pushNotice(noticeEvent: NoticeEvent) = noticeEventFlow.emit(noticeEvent)
 
-    private suspend fun pushRequest(requestEvent: RequestsEvent) = requestEventFlow.emit(requestEvent)
+    private suspend fun pushRequest(requestEvent: RequestEvent) = requestEventFlow.emit(requestEvent)
 
     private suspend fun transMessageEvent(record: MsgRecord, message: PushMessageBody) =
         MessageEventFlow.emit(record to message)
@@ -44,7 +46,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.messageId = record.msgId.toString()
                 this.messageSeq = record.msgSeq
                 this.contact = Contact.newBuilder().apply {
-                    this.scene = scene
+                    this.scene = Scene.GROUP
                     this.peer = record.peerUin.toString()
                     this.subPeer = record.peerUid
                 }.build()
@@ -67,8 +69,8 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.messageId = record.msgId.toString()
                 this.messageSeq = record.msgSeq
                 this.contact = Contact.newBuilder().apply {
-                    this.scene = scene
-                    this.peer = record.senderUin.toString()
+                    this.scene = Scene.FRIEND
+                    this.peer = record.senderUid
                     this.subPeer = record.senderUid
                 }.build()
                 this.sender = Sender.newBuilder().apply {
@@ -92,8 +94,8 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.messageId = record.msgId.toString()
                 this.messageSeq = record.msgSeq
                 this.contact = Contact.newBuilder().apply  {
-                    this.scene = scene
-                    this.peer = record.senderUin.toString()
+                    this.scene = if (groupCode > 0) Scene.STRANGER_FROM_GROUP else Scene.STRANGER
+                    this.peer = record.senderUid
                     this.subPeer = groupCode.toString()
                 }.build()
                 this.sender = Sender.newBuilder().apply {
@@ -115,7 +117,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.messageId = record.msgId.toString()
                 this.messageSeq = record.msgSeq
                 this.contact = Contact.newBuilder().apply {
-                    this.scene = scene
+                    this.scene = Scene.GUILD
                     this.peer = record.guildId ?: ""
                     this.subPeer = record.channelId ?: ""
                 }.build()
@@ -139,7 +141,8 @@ internal object GlobalEventTransmitter : QQInterfaces() {
          */
         suspend fun transPrivateFileEvent(
             msgTime: Long,
-            userId: Long,
+            senderUid: String,
+            senderUin: Long,
             fileId: String,
             fileSubId: String,
             fileName: String,
@@ -148,12 +151,13 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             url: String
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.FRIEND_FILE_COME
+                this.type = NoticeEvent.NoticeType.PRIVATE_FILE_UPLOADED
                 this.time = msgTime.toInt()
-                this.friendFileUploaded = FriendFileUploadedNotice.newBuilder().apply {
+                this.privateFileUploaded = PrivateFileUploadedNotice.newBuilder().apply {
                     this.fileId = fileId
                     this.fileName = fileName
-                    this.operatorUin = userId
+                    this.operatorUid = senderUid
+                    this.operatorUin = senderUin
                     this.fileSize = fileSize
                     this.expireTime = expireTime.toInt()
                     this.fileSubId = fileSubId
@@ -168,7 +172,8 @@ internal object GlobalEventTransmitter : QQInterfaces() {
          */
         suspend fun transGroupFileEvent(
             msgTime: Long,
-            userId: Long,
+            senderUid: String,
+            senderUin: Long,
             groupId: Long,
             uuid: String,
             fileName: String,
@@ -177,16 +182,17 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             url: String
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.GROUP_FILE_COME
+                this.type = NoticeEvent.NoticeType.GROUP_FILE_UPLOADED
                 this.time = msgTime.toInt()
                 this.groupFileUploaded = GroupFileUploadedNotice.newBuilder().apply {
                     this.groupId = groupId
-                    this.operatorUin = userId
+                    this.operatorUid = senderUid
+                    this.operatorUin = senderUin
                     this.fileId = uuid
                     this.fileName = fileName
                     this.fileSize = fileSize
-                    this.biz = bizId
-                    this.url = url
+                    this.busId = bizId
+                    this.fileUrl = url
                 }.build()
             }.build())
             return true
@@ -200,19 +206,19 @@ internal object GlobalEventTransmitter : QQInterfaces() {
         suspend fun transGroupSign(
             time: Long,
             target: Long,
-            action: String?,
-            rankImg: String?,
+            action: String,
+            rankImg: String,
             groupCode: Long
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.GROUP_SIGN
+                this.type = NoticeEvent.NoticeType.GROUP_SIGN_IN
                 this.time = time.toInt()
                 this.groupSignIn = GroupSignInNotice.newBuilder().apply {
                     this.groupId = groupCode
+                    this.targetUid = ContactHelper.getUidByUinAsync(target)
                     this.targetUin = target
-                    this.action = action ?: ""
-                    this.suffix = ""
-                    this.rankImage = rankImg ?: ""
+                    this.action = action
+                    this.rankImage = rankImg
                 }.build()
             }.build())
             return true
@@ -222,9 +228,9 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             time: Long,
             operator: Long,
             target: Long,
-            action: String?,
-            suffix: String?,
-            actionImg: String?,
+            action: String,
+            suffix: String,
+            actionImg: String,
             groupCode: Long
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
@@ -232,11 +238,13 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.time = time.toInt()
                 this.groupPoke = GroupPokeNotice.newBuilder().apply {
                     this.groupId = groupCode
-                    this.action = action ?: ""
+                    this.action = action
+                    this.targetUid = ContactHelper.getUidByUinAsync(target)
                     this.targetUin = target
+                    this.operatorUid = ContactHelper.getUidByUinAsync(operator)
                     this.operatorUin = operator
-                    this.suffix = suffix ?: ""
-                    this.actionImage = actionImg ?: ""
+                    this.suffix = suffix
+                    this.actionImage = actionImg
                 }.build()
             }.build())
             return true
@@ -276,7 +284,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             type: GroupMemberDecreasedNotice.GroupMemberDecreasedType
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.GROUP_MEMBER_INCREASE
+                this.type = NoticeEvent.NoticeType.GROUP_MEMBER_DECREASE
                 this.time = time.toInt()
                 this.groupMemberDecrease = GroupMemberDecreasedNotice.newBuilder().apply {
                     this.groupId = groupCode
@@ -300,7 +308,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             pushNotice(NoticeEvent.newBuilder().apply {
                 this.type = NoticeEvent.NoticeType.GROUP_ADMIN_CHANGED
                 this.time = msgTime.toInt()
-                this.groupAdminChange = GroupAdminChangedNotice.newBuilder().apply {
+                this.groupAdminChanged = GroupAdminChangedNotice.newBuilder().apply {
                     this.groupId = groupCode
                     this.targetUid = targetUid
                     this.targetUin = target
@@ -312,8 +320,9 @@ internal object GlobalEventTransmitter : QQInterfaces() {
 
         suspend fun transGroupWholeBan(
             msgTime: Long,
-            operator: Long,
             groupCode: Long,
+            operatorUid: String,
+            operator: Long,
             isOpen: Boolean
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
@@ -322,6 +331,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.groupWholeBan = GroupWholeBanNotice.newBuilder().apply {
                     this.groupId = groupCode
                     this.isBan = isOpen
+                    this.operatorUid = operatorUid
                     this.operatorUin = operator
                 }.build()
             }.build())
@@ -338,7 +348,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             duration: Int
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.GROUP_MEMBER_BANNED
+                this.type = NoticeEvent.NoticeType.GROUP_MEMBER_BAN
                 this.time = msgTime.toInt()
                 this.groupMemberBan = GroupMemberBanNotice.newBuilder().apply {
                     this.groupId = groupCode
@@ -400,7 +410,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
 
         suspend fun transTitleChange(
             time: Long,
-            targetId: Long,
+            targetUin: Long,
             title: String,
             groupId: Long
         ): Boolean {
@@ -409,7 +419,8 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.time = time.toInt()
                 this.groupMemberUniqueTitleChanged = GroupUniqueTitleChangedNotice.newBuilder().apply {
                     this.groupId = groupId
-                    this.target = targetId
+                    this.targetUid = ContactHelper.getUidByUinAsync(targetUin)
+                    this.targetUin = targetUin
                     this.title = title
                 }.build()
             }.build())
@@ -430,9 +441,11 @@ internal object GlobalEventTransmitter : QQInterfaces() {
                 this.groupEssenceChanged = GroupEssenceMessageNotice.newBuilder().apply {
                     this.groupId = groupId
                     this.messageId = msgId.toString()
+                    this.targetUid = ContactHelper.getUidByUinAsync(targetUin)
                     this.targetUin = senderUin
+                    this.operatorUid = ContactHelper.getUidByUinAsync(operatorUin)
                     this.operatorUin = operatorUin
-                    this.subType = subType.toInt()
+                    this.isSet = subType.toInt() == 1
                 }.build()
             }.build())
             return true
@@ -446,16 +459,16 @@ internal object GlobalEventTransmitter : QQInterfaces() {
         suspend fun transPrivatePoke(
             msgTime: Long,
             operator: Long,
-            target: Long,
             action: String?,
             suffix: String?,
             actionImg: String?
         ): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.FRIEND_POKE
+                this.type = NoticeEvent.NoticeType.PRIVATE_POKE
                 this.time = msgTime.toInt()
-                this.friendPoke = FriendPokeNotice.newBuilder().apply {
+                this.privatePoke = PrivatePokeNotice.newBuilder().apply {
                     this.action = action ?: ""
+                    this.operatorUid = ContactHelper.getUidByUinAsync(operator)
                     this.operatorUin = operator
                     this.suffix = suffix ?: ""
                     this.actionImage = actionImg ?: ""
@@ -466,9 +479,9 @@ internal object GlobalEventTransmitter : QQInterfaces() {
 
         suspend fun transPrivateRecall(time: Long, operator: Long, msgId: Long, tipText: String): Boolean {
             pushNotice(NoticeEvent.newBuilder().apply {
-                this.type = NoticeEvent.NoticeType.FRIEND_RECALL
+                this.type = NoticeEvent.NoticeType.PRIVATE_RECALL
                 this.time = time.toInt()
-                this.friendRecall = FriendRecallNotice.newBuilder().apply {
+                this.privateRecall = PrivateRecallNotice.newBuilder().apply {
                     this.operatorUin = operator
                     this.messageId = msgId.toString()
                     this.tipText = tipText
@@ -483,14 +496,15 @@ internal object GlobalEventTransmitter : QQInterfaces() {
      * 请求 通知器
      */
     object RequestTransmitter {
-        suspend fun transFriendApp(time: Long, operator: Long, tipText: String, flag: String): Boolean {
-            pushRequest(RequestsEvent.newBuilder().apply {
-                this.type = RequestsEvent.RequestType.FRIEND_APPLY
+        suspend fun transFriendApp(time: Long, applierUid: String, operator: Long, tipText: String, flag: String): Boolean {
+            pushRequest(RequestEvent.newBuilder().apply {
+                this.type = RequestEvent.RequestType.FRIEND_APPLY
                 this.time = time.toInt()
+                this.requestId = flag
                 this.friendApply = FriendApplyRequest.newBuilder().apply {
+                    this.applierUid = applierUid
                     this.applierUin = operator
                     this.message = tipText
-                    this.flag = flag
                 }.build()
             }.build())
             return true
@@ -504,15 +518,35 @@ internal object GlobalEventTransmitter : QQInterfaces() {
             groupCode: Long,
             flag: String
         ): Boolean {
-            pushRequest(RequestsEvent.newBuilder().apply {
-                this.type = RequestsEvent.RequestType.GROUP_APPLY
+            pushRequest(RequestEvent.newBuilder().apply {
+                this.type = RequestEvent.RequestType.GROUP_APPLY
                 this.time = time.toInt()
+                this.requestId = flag
                 this.groupApply = GroupApplyRequest.newBuilder().apply {
                     this.applierUid = applierUid
                     this.applierUin = applierUin
                     this.groupId = groupCode
                     this.reason = reason
-                    this.flag = flag
+                }.build()
+            }.build())
+            return true
+        }
+
+        suspend fun transGroupInvite(
+            time: Long,
+            inviterUid: String,
+            inviterUin: Long,
+            groupCode: Long,
+            flag: String
+        ): Boolean {
+            pushRequest(RequestEvent.newBuilder().apply {
+                this.type = RequestEvent.RequestType.GROUP_APPLY
+                this.time = time.toInt()
+                this.requestId = flag
+                this.invitedGroup = InvitedJoinGroupRequest.newBuilder().apply {
+                    this.inviterUid = inviterUid
+                    this.inviterUin = inviterUin
+                    this.groupId = groupCode
                 }.build()
             }.build())
             return true
@@ -535,7 +569,7 @@ internal object GlobalEventTransmitter : QQInterfaces() {
         }
     }
 
-    suspend inline fun onRequestEvent(collector: FlowCollector<RequestsEvent>) {
+    suspend inline fun onRequestEvent(collector: FlowCollector<RequestEvent>) {
         requestEventFlow.collect {
             GlobalScope.launch {
                 collector.emit(it)

xposed/src/main/java/qq/service/file/GroupFileHelper.kt

@@ -117,7 +117,7 @@ internal object GroupFileHelper: QQInterfaces() {
                                 this.fileSize = fileInfo.uint64_file_size.get()
                                 this.busId = fileInfo.uint32_bus_id.get()
                                 this.uploadTime = fileInfo.uint32_upload_time.get()
-                                this.deadTime = fileInfo.uint32_dead_time.get()
+                                this.expireTime = fileInfo.uint32_dead_time.get()
                                 this.modifyTime = fileInfo.uint32_modify_time.get()
                                 this.downloadTimes = fileInfo.uint32_download_times.get()
                                 this.uploader = fileInfo.uint64_uploader_uin.get()

xposed/src/main/java/qq/service/internals/AioListener.kt

@@ -97,7 +97,6 @@ object AioListener : SimpleKernelMsgListener() {
     }
 
     private suspend fun onC2CFileMsg(record: MsgRecord) {
-        val userId = record.senderUin
         val fileMsg = record.elements.firstOrNull {
             it.elementType == MsgConstant.KELEMTYPEFILE
         }?.fileElement ?: kotlin.run {
@@ -113,7 +112,7 @@ object AioListener : SimpleKernelMsgListener() {
         val url = RichProtoSvc.getC2CFileDownUrl(fileId, fileSubId)
 
         if (!GlobalEventTransmitter.FileNoticeTransmitter
-                .transPrivateFileEvent(record.msgTime, userId, fileId, fileSubId, fileName, fileSize, expireTime, url)
+                .transPrivateFileEvent(record.msgTime, record.senderUid, record.senderUin, fileId, fileSubId, fileName, fileSize, expireTime, url)
         ) {
             LogCenter.log("私聊文件消息推送失败 -> FileNoticeTransmitter", Level.WARN)
         }
@@ -121,7 +120,6 @@ object AioListener : SimpleKernelMsgListener() {
 
     private suspend fun onGroupFileMsg(record: MsgRecord) {
         val groupId = record.peerUin
-        val userId = record.senderUin
         val fileMsg = record.elements.firstOrNull {
             it.elementType == MsgConstant.KELEMTYPEFILE
         }?.fileElement ?: kotlin.run {
@@ -137,7 +135,7 @@ object AioListener : SimpleKernelMsgListener() {
         val url = RichProtoSvc.getGroupFileDownUrl(record.peerUin, uuid, bizId)
 
         if (!GlobalEventTransmitter.FileNoticeTransmitter
-                .transGroupFileEvent(record.msgTime, userId, groupId, uuid, fileName, fileSize, bizId, url)
+                .transGroupFileEvent(record.msgTime, record.senderUid, record.senderUin, groupId, uuid, fileName, fileSize, bizId, url)
         ) {
             LogCenter.log("群聊文件消息推送失败 -> FileNoticeTransmitter", Level.WARN)
         }

xposed/src/main/java/qq/service/internals/PrimitiveListener.kt

@@ -126,7 +126,7 @@ internal object PrimitiveListener {
         LogCenter.log("私聊戳一戳: $operation $action $target $suffix")
 
         if (!GlobalEventTransmitter.PrivateNoticeTransmitter
-                .transPrivatePoke(msgTime, operation.toLong(), target.toLong(), action, suffix, actionImg)
+                .transPrivatePoke(msgTime, operation.toLong(), action, suffix, actionImg)
         ) {
             LogCenter.log("私聊戳一戳推送失败！", Level.WARN)
         }
@@ -161,7 +161,7 @@ internal object PrimitiveListener {
         }
         LogCenter.log("来自$applier 的好友申请：$msg ($source)")
         if (!GlobalEventTransmitter.RequestTransmitter
-                .transFriendApp(msgTime, applier, msg, flag)
+                .transFriendApp(msgTime, applierUid, applier, msg, flag)
         ) {
             LogCenter.log("好友申请推送失败！", Level.WARN)
         }
@@ -320,8 +320,8 @@ internal object PrimitiveListener {
             it.key to it.value
         }
 
-        val target = params["uin_str2"] ?: params["mqq_uin"] ?: return
-        val operation = params["uin_str1"] ?: return
+        val target = params["uin_str2"] ?: params["mqq_uin"] ?: ""
+        val operator = params["uin_str1"] ?: ""
         val suffix = params["suffix_str"] ?: ""
         val actionImg = params["action_img_url"] ?: ""
         val action = params["alt_str1"]
@@ -332,9 +332,9 @@ internal object PrimitiveListener {
 
         when (detail.type) {
             1061u -> {
-                LogCenter.log("群戳一戳($groupId): $operation $action $target $suffix")
+                LogCenter.log("群戳一戳($groupId): $operator $action $target $suffix")
                 if (!GlobalEventTransmitter.GroupNoticeTransmitter
-                        .transGroupPoke(time, operation.toLong(), target.toLong(), action, suffix, actionImg, groupId)
+                        .transGroupPoke(time, operator.toLong(), target.toLong(), action, suffix, actionImg, groupId)
                 ) {
                     LogCenter.log("群戳一戳推送失败！", Level.WARN)
                 }
@@ -506,7 +506,7 @@ internal object PrimitiveListener {
         if (wholeBan) {
             LogCenter.log("群全员禁言($groupCode): $operator -> ${if (rawDuration != 0) "开启" else "关闭"}")
             if (!GlobalEventTransmitter.GroupNoticeTransmitter
-                    .transGroupWholeBan(msgTime, groupCode, operator, rawDuration != 0)
+                    .transGroupWholeBan(msgTime, groupCode, operatorUid, operator, rawDuration != 0)
             ) {
                 LogCenter.log("群禁言推送失败！", Level.WARN)
             }
@@ -657,7 +657,7 @@ internal object PrimitiveListener {
             "$time;$groupCode;$uin"
         }
         if (!GlobalEventTransmitter.RequestTransmitter
-                .transGroupApply(time, invitor, invitorUid, "", groupCode, flag)
+                .transGroupInvite(time, invitorUid, invitor, groupCode, flag)
         ) {
             LogCenter.log("邀请入群推送失败！", Level.WARN)
         }

xposed/src/main/java/qq/service/msg/MsgConvertor.kt

@@ -401,10 +401,10 @@ private object MsgConvertor {
     suspend fun convertInlineKeyboard(record: MsgRecord, element: MsgElement): Result<Element> {
         val inlineKeyboard = element.inlineKeyboardElement
         val elem = Element.newBuilder()
-        elem.type = ElementType.BUTTON
-        elem.setButton(ButtonElement.newBuilder().apply {
+        elem.type = ElementType.KEYBOARD
+        elem.setKeyboard(KeyboardElement.newBuilder().apply {
             inlineKeyboard.rows.forEach { row ->
-                this.addRows(ButtonRow.newBuilder().apply {
+                    this.addRows(KeyboardRow.newBuilder().apply {
                     row.buttons.forEach buttonsLoop@{ button ->
                         if (button == null) return@buttonsLoop
                         this.addButtons(Button.newBuilder().apply {

xposed/src/main/java/qq/service/msg/MultiConvertor.kt

@@ -227,9 +227,9 @@ suspend fun List<Elem>.toKritorResponseMessages(contact: Contact): ArrayList<Ele
                 46 -> {
                     val buttonExtra = commonElem.elem!!.decodeProtobuf<ButtonExtra>()
                     kritorMessages.add(
-                        Element.newBuilder().setButton(ButtonElement.newBuilder().apply {
+                        Element.newBuilder().setKeyboard(KeyboardElement.newBuilder().apply {
                             this.addAllRows(buttonExtra.field1!!.rows!!.map { row ->
-                                ButtonRow.newBuilder().apply {
+                                KeyboardRow.newBuilder().apply {
                                     this.addAllButtons(row.buttons!!.map { button ->
                                         Button.newBuilder().apply {
                                             this.id = button.id

xposed/src/main/java/qq/service/msg/NtMsgConvertor.kt

@@ -97,7 +97,7 @@ object NtMsgConvertor {
         ElementType.JSON to ::jsonConvertor,
         ElementType.FORWARD to ::forwardConvertor,
         ElementType.MARKDOWN to ::markdownConvertor,
-        ElementType.BUTTON to ::buttonConvertor,
+        ElementType.KEYBOARD to ::buttonConvertor,
     )
 
     suspend fun convertToNtMsgs(contact: Contact, msgId: Long, msgs: Messages): ArrayList<MsgElement> {
@@ -663,14 +663,14 @@ object NtMsgConvertor {
                 }
             }
 
-            MusicPlatform.NetEase -> {
+            MusicPlatform.NETEASE -> {
                 val id = sourceMusic.music.id
                 if (!MusicHelper.tryShare163MusicById(contact, msgId, id)) {
                     LogCenter.log("无法发送网易云音乐分享", Level.ERROR)
                 }
             }
 
-            MusicPlatform.Custom -> {
+            MusicPlatform.CUSTOM -> {
                 val data = sourceMusic.music.custom
                 ArkMsgHelper.tryShareMusic(
                     contact,
@@ -848,7 +848,7 @@ object NtMsgConvertor {
         elem.elementType = MsgConstant.KELEMTYPEINLINEKEYBOARD
         val rows = arrayListOf<InlineKeyboardRow>()
 
-        val keyboard = sourceButton.button
+        val keyboard = sourceButton.keyboard
         keyboard.rowsList.forEach { row ->
             val buttons = arrayListOf<InlineKeyboardButton>()
             row.buttonsList.forEach { button ->

xposed/src/main/java/qq/service/msg/ReqMessageConvertor.kt

@@ -366,9 +366,9 @@ private object ReqMsgConvertor {
     suspend fun convertInlineKeyboard(contact: Contact, element: MsgElement): Result<Element> {
         val inlineKeyboard = element.inlineKeyboardElement
         val elem = Element.newBuilder()
-        elem.setButton(ButtonElement.newBuilder().apply {
+        elem.setKeyboard(KeyboardElement.newBuilder().apply {
             this.addAllRows(inlineKeyboard.rows.map { row ->
-                ButtonRow.newBuilder().apply {
+                KeyboardRow.newBuilder().apply {
                     this.addAllButtons(row.buttons.map { button ->
                         Button.newBuilder().apply {
                             this.id = button.id

xposed/src/main/java/qq/service/msg/ReqMultiConvertor.kt

@@ -511,13 +511,13 @@ suspend fun List<Element>.toRichText(contact: Contact): Result<Pair<String, Rich
                     elems.add(elem)
                     summary.append("[Markdown消息]")
                 }
-                Element.ElementType.BUTTON -> {
+                Element.ElementType.KEYBOARD -> {
                     val elem = Elem(
                         commonElem = CommonElem(
                             serviceType = 46,
                             elem = ButtonExtra(
                                 field1 = Object1(
-                                    rows = it.button.rowsList.map { row ->
+                                    rows = it.keyboard.rowsList.map { row ->
                                         Row(buttons = row.buttonsList.map { button ->
                                             val renderData = button.renderData
                                             val action = button.action
@@ -544,7 +544,7 @@ suspend fun List<Element>.toRichText(contact: Contact): Result<Pair<String, Rich
                                             )
                                         })
                                     },
-                                    appid = it.button.botAppid.toULong()
+                                    appid = it.keyboard.botAppid.toULong()
                                 )
                             ).toByteArray(),
                             businessType = 1