Shamrock: Disable lost connection detection

feat: get group applier uin from request msg

SECURITY.md

@@ -1,11 +1,19 @@
 # Security Policy
 
-## Support Version
+## 支持的版本
 
-| Version | Supported          |
+| 版本 | 支持状态          |
 | ------- | ------------------ |
+| 9.0.15  | :white_check_mark: |
 | 8.9.75  | :white_check_mark: |
 | 8.9.73  | :white_check_mark: |
 | 8.9.98  | :white_check_mark: |
 | < 8.9.68| :x:                |
 
+## 频道支持性说明
+
+如果需要使用`频道`相关功能，请升级QQ到9.0.8版本！
+
+## Riru检测问题
+
+QQ自`9.0.8`开始将会检测riru，可能作为封号因素。

xposed/src/main/java/moe/fuqiuluo/shamrock/helper/MessageHelper.kt

@@ -353,6 +353,21 @@ internal object MessageHelper {
         database.messageMappingDao().insert(mapping)
     }
 
+    fun saveMsgMappingNotExist(
+        hash: Int,
+        qqMsgId: Long,
+        time: Long,
+        chatType: Int,
+        peerId: String,
+        subPeerId: String,
+        msgSeq: Int,
+        subChatType: Int = chatType
+    ) {
+        val database = MessageDB.getInstance()
+        val mapping = MessageMapping(hash, qqMsgId, chatType, subChatType, peerId, time, msgSeq, subPeerId)
+        database.messageMappingDao().insertNotExist(mapping)
+    }
+
     external fun createMessageUniseq(chatType: Int, time: Long): Long
 
     fun decodeCQCode(code: String): JsonArray {

xposed/src/main/java/moe/fuqiuluo/shamrock/helper/db/MessageDB.kt

@@ -30,6 +30,9 @@ interface MessageMappingDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(mapping: MessageMapping)
 
+    @Insert(onConflict = OnConflictStrategy.ABORT)
+    fun insertNotExist(mapping: MessageMapping)
+
     @Query("UPDATE message_mapping_v2 SET msgSeq = :msgSeq WHERE msgHashId = :hash")
     fun updateMsgSeqByMsgHash(hash: Int, msgSeq: Int)
 

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGProChannelList.kt

@@ -1,5 +1,6 @@
 package moe.fuqiuluo.shamrock.remote.action.handlers
 
+import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
@@ -18,8 +19,10 @@ internal object GetGProChannelList: IActionHandler() {
         return invoke(guildId.toULong(), refresh, echo = session.echo)
     }
 
-    operator fun invoke(guildId: ULong, refresh: Boolean, echo: JsonElement = EmptyJsonString): String {
+    suspend operator fun invoke(guildId: ULong, refresh: Boolean, echo: JsonElement = EmptyJsonString): String {
-        val result = GProSvc.getChannelList(guildId, refresh)
+        val result = withTimeoutOrNull(5000) {
+            GProSvc.getChannelList(guildId, refresh)
+        } ?: return error("timeout", echo)
         result.onFailure {
             return error(it.message ?: "unable to fetch channel list", echo)
         }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetHistoryMsg.kt

@@ -59,6 +59,16 @@ internal object GetHistoryMsg: IActionHandler() {
         val msgList = ArrayList<MessageDetail>().apply {
             addAll(result.data!!.map { msg ->
                 val msgHash = MessageHelper.generateMsgIdHash(msg.chatType, msg.msgId)
+                MessageHelper.saveMsgMappingNotExist(
+                    hash = msgHash,
+                    qqMsgId = msg.msgId,
+                    chatType = msg.chatType,
+                    subChatType = msg.chatType,
+                    peerId = peerId,
+                    msgSeq = msg.msgSeq.toInt(),
+                    time = msg.msgTime,
+                    subPeerId = msg.channelId ?: peerId
+                )
                 MessageDetail(
                     time = msg.msgTime.toInt(),
                     msgType = MessageHelper.obtainDetailTypeByMsgType(msg.chatType),

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/ModifyTroopMemberName.kt

@@ -2,6 +2,7 @@ package moe.fuqiuluo.shamrock.remote.action.handlers
 
 import kotlinx.serialization.json.JsonElement
 import moe.fuqiuluo.qqinterface.servlet.GroupSvc
+import moe.fuqiuluo.qqinterface.servlet.TicketSvc
 import moe.fuqiuluo.shamrock.remote.action.ActionSession
 import moe.fuqiuluo.shamrock.remote.action.IActionHandler
 import moe.fuqiuluo.shamrock.tools.EmptyJsonString
@@ -17,7 +18,7 @@ internal object ModifyTroopMemberName: IActionHandler() {
     }
 
     operator fun invoke(groupId: String, userId: String, card: String, echo: JsonElement = EmptyJsonString): String {
-        if (!GroupSvc.isAdmin(groupId)) {
+        if (!GroupSvc.isAdmin(groupId) && userId != TicketSvc.getUin()) {
             return logic("you are not admin", echo)
         }
         return if(GroupSvc.modifyGroupMemberCard(groupId.toLong(), userId.toLong(), card))

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/api/BDHWorker.kt

@@ -5,6 +5,7 @@ import com.tencent.mobileqq.transfile.TransferRequest
 import com.tencent.mobileqq.transfile.api.ITransFileController
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.post
+import moe.fuqiuluo.shamrock.remote.service.config.ShamrockConfig
 import moe.fuqiuluo.shamrock.remote.structures.Status
 import moe.fuqiuluo.shamrock.tools.fetchPost
 import moe.fuqiuluo.shamrock.tools.respond
@@ -15,7 +16,7 @@ import kotlin.random.Random
 import kotlin.random.nextLong
 
 fun Routing.registerBDH() {
-    post("/upload_group_image") {
+    if(ShamrockConfig.isDev()) post("/upload_group_image") {
         val troop = fetchPost("troop")
         val picBytes = Base64.decode(fetchPost("pic"), Base64.DEFAULT)
         val md5Str = MD5.getMd5Hex(picBytes)
@@ -46,5 +47,4 @@ fun Routing.registerBDH() {
             .transferAsync(transferRequest)
         respond(isOk = true, Status.Ok, "$md5Str.jpg")
     }
-
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt

@@ -172,6 +172,8 @@ internal object GlobalEventTransmitter: BaseSvc() {
                     postType = postType,
                     messageType = MsgType.Guild,
                     subType = MsgSubType.Channel,
+                    guildId = record.guildId,
+                    channelId = record.channelId,
                     messageId = msgHash,
                     targetId = record.peerUin,
                     peerId = botUin,

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt

@@ -41,6 +41,10 @@ internal abstract class WebSocketTransmitServlet(
     private val sendLock = Mutex()
     protected val eventReceivers: MutableList<WebSocket> = Collections.synchronizedList(mutableListOf<WebSocket>())
 
+    init {
+        connectionLostTimeout = 0
+    }
+
     override val address: String
         get() = "-"
 

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/MessageEvent.kt

@@ -53,6 +53,8 @@ internal data class MessageEvent (
     @SerialName("sub_type") val subType: MsgSubType,
     @SerialName("message_id") val messageId: Int,
     @SerialName("group_id") val groupId: Long = 0,
+    @SerialName("guild_id") val guildId: String? = null,
+    @SerialName("channel_id") val channelId: String? = null,
     @SerialName("target_id") val targetId: Long = 0,
     @SerialName("peer_id") val peerId: Long,
     @SerialName("user_id") val userId: Long,

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/AioListener.kt

@@ -89,10 +89,12 @@ internal object AioListener : IKernelMsgListener {
 
                     if (!GlobalEventTransmitter.MessageTransmitter.transGroupMessage(
                             record, record.elements, rawMsg, msgHash, postType
-                    )) {
+                        )
+                    ) {
                         LogCenter.log("群消息推送失败 -> 推送目标可能不存在", Level.WARN)
                     }
                 }
+
                 MsgConstant.KCHATTYPEC2C -> {
                     LogCenter.log("私聊消息(private = ${record.senderUin}, id = [$msgHash | ${record.msgId} | ${record.msgSeq}], msg = $rawMsg)")
                     ShamrockConfig.getPrivateRule()?.let { rule ->
@@ -102,7 +104,8 @@ internal object AioListener : IKernelMsgListener {
 
                     if (!GlobalEventTransmitter.MessageTransmitter.transPrivateMessage(
                             record, record.elements, rawMsg, msgHash, postType
-                    )) {
+                        )
+                    ) {
                         LogCenter.log("私聊消息推送失败 -> MessageTransmitter", Level.WARN)
                     }
                 }
@@ -117,8 +120,14 @@ internal object AioListener : IKernelMsgListener {
                     }
 
                     if (!GlobalEventTransmitter.MessageTransmitter.transPrivateMessage(
-                            record, record.elements, rawMsg, msgHash, tempSource = MessageTempSource.Group, postType = postType
+                            record,
-                        )) {
+                            record.elements,
+                            rawMsg,
+                            msgHash,
+                            tempSource = MessageTempSource.Group,
+                            postType = postType
+                        )
+                    ) {
                         LogCenter.log("私聊临时消息推送失败 -> MessageTransmitter", Level.WARN)
                     }
                 }
@@ -174,8 +183,6 @@ internal object AioListener : IKernelMsgListener {
 
     override fun onMsgInfoListUpdate(msgList: ArrayList<MsgRecord>?) {
         msgList?.forEach { record ->
-            if (record.chatType == MsgConstant.KCHATTYPEGUILD) return@forEach// TODO: 频道消息暂不处理
-
             if (record.sendStatus == MsgConstant.KSENDSTATUSFAILED
                 || record.sendStatus == MsgConstant.KSENDSTATUSSENDING
             ) {
@@ -449,6 +456,7 @@ internal object AioListener : IKernelMsgListener {
     override fun onGuildMsgAbFlagChanged(guildMsgAbFlag: GuildMsgAbFlag?) {
 
     }
+
     override fun onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: GuildNotificationAbstractInfo?) {
 
     }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt

@@ -534,12 +534,11 @@ internal object PrimitiveListener {
                 val groupCode = event.groupCode
                 val applierUid = event.applierUid
                 val reason = event.applyMsg ?: ""
-                val applier = ContactHelper.getUinByUidAsync(applierUid).toLong()
+                var applier = ContactHelper.getUinByUidAsync(applierUid).toLong()
                 if (applier == getLongUin()) {
                     return
                 }
                 val msgSeq = contentHead.msgSeq
-                LogCenter.log("入群申请($groupCode) $applier: \"$reason\", seq: $msgSeq")
                 val flag = try {
                     var reqs = requestGroupSystemMsgNew(10, 1)
                     val riskReqs = requestGroupSystemMsgNew(5, 2)
@@ -548,10 +547,14 @@ internal object PrimitiveListener {
                         it.msg_time.get() == time && it.msg?.group_code?.get() == groupCode
                     }
                     val seq = req?.msg_seq?.get() ?: time
+                    if (applier == 0L) {
+                        applier = req?.req_uin?.get() ?: 0L
+                    }
                     "$seq;$groupCode;$applier"
                 } catch (err: Throwable) {
                     "$time;$groupCode;$applier"
                 }
+                LogCenter.log("入群申请($groupCode) $applier: \"$reason\", seq: $msgSeq")
                 if (!GlobalEventTransmitter.RequestTransmitter
                         .transGroupApply(time, applier, applierUid, reason, groupCode, flag, RequestSubType.Add)
                 ) {
@@ -562,7 +565,7 @@ internal object PrimitiveListener {
                 val event = ProtoBuf.decodeFromByteArray<GroupInvitedApplyEvent>(richMsg.rawBuffer!!)
                 val groupCode = event.applyInfo?.groupCode ?: return
                 val applierUid = event.applyInfo?.applierUid ?: return
-                val applier = ContactHelper.getUinByUidAsync(applierUid).toLong()
+                var applier = ContactHelper.getUinByUidAsync(applierUid).toLong()
                 if (applier == getLongUin()) {
                     return
                 }
@@ -570,7 +573,6 @@ internal object PrimitiveListener {
                     // todo
                     return
                 }
-                LogCenter.log("邀请入群申请($groupCode): $applier")
                 val flag = try {
                     var reqs = requestGroupSystemMsgNew(10, 1)
                     val riskReqs = requestGroupSystemMsgNew(5, 2)
@@ -579,10 +581,14 @@ internal object PrimitiveListener {
                         it.msg_time.get() == time
                     }
                     val seq = req?.msg_seq?.get() ?: time
+                    if (applier == 0L) {
+                        applier = req?.req_uin?.get() ?: 0L
+                    }
                     "$seq;$groupCode;$applier"
                 } catch (err: Throwable) {
                     "$time;$groupCode;$applier"
                 }
+                LogCenter.log("邀请入群申请($groupCode): $applier")
                 if (!GlobalEventTransmitter.RequestTransmitter
                         .transGroupApply(time, applier, applierUid, "", groupCode, flag, RequestSubType.Add)
                 ) {