Merge pull request #193 from MrXiaoM/fix-group-ban

支持全员禁言通知事件

xposed/src/main/java/moe/fuqiuluo/proto/ProtoMap.kt

@@ -61,7 +61,7 @@ class ProtoMap(
         var curMap = value
         tags.forEachIndexed { index, tag ->
             if (index == tags.size - 1) {
-                return curMap[tag] ?: error("Tag $tag not found")
+                return curMap[tag] ?: error("pb[${tags.joinToString(", ")}][$index] Tag $tag not found")
             }
             curMap[tag]?.let { v ->
                 if (v is ProtoMap) {
@@ -69,7 +69,7 @@ class ProtoMap(
                 } else {
                     return v
                 }
-            } ?: error("Tag $tag not found")
+            } ?: error("pb[${tags.joinToString(", ")}][$index] Tag $tag not found")
         }
         error("Instance is not ProtoMap for get(${tags.first()})")
     }

xposed/src/main/java/moe/fuqiuluo/qqinterface/servlet/msg/convert/MessageElemConverter.kt

@@ -324,7 +324,8 @@ internal sealed class MessageElemConverter: IMessageConvert {
                     val notify = tip.jsonGrayTipElement
                     when(notify.busiId) {
                         /* 新人入群 */ 17L, /* 群戳一戳 */1061L,
-                        /* 群撤回 */1014L, /* 群设精消息 */2401L -> {}
+                        /* 群撤回 */1014L, /* 群设精消息 */2401L,
+                        /* 群头衔 */2407L -> {}
                         else -> LogCenter.log("不支持的灰条类型(JSON): ${notify.busiId}", Level.WARN)
                     }
                 }

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

@@ -305,6 +305,7 @@ internal object GlobalEventTransmitter: BaseSvc() {
 
         suspend fun transGroupBan(
             msgTime: Long,
+            subType: NoticeSubType,
             operation: Long,
             target: Long,
             groupCode: Long,
@@ -315,7 +316,7 @@ internal object GlobalEventTransmitter: BaseSvc() {
                 selfId = app.longAccountUin,
                 postType = PostType.Notice,
                 type = NoticeType.GroupBan,
-                subType = if (duration == 0) NoticeSubType.LiftBan else NoticeSubType.Ban,
+                subType = subType,
                 operatorId = operation,
                 userId = target,
                 senderId = operation,

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

@@ -12,15 +12,7 @@ import kotlinx.io.core.discardExact
 import kotlinx.io.core.readBytes
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
-import moe.fuqiuluo.proto.ProtoByteString
+import moe.fuqiuluo.proto.*
-import moe.fuqiuluo.proto.ProtoMap
-import moe.fuqiuluo.proto.asInt
-import moe.fuqiuluo.proto.asLong
-import moe.fuqiuluo.proto.asUtf8String
-import moe.fuqiuluo.proto.ProtoUtils
-import moe.fuqiuluo.proto.asByteArray
-import moe.fuqiuluo.proto.asList
-import moe.fuqiuluo.proto.asULong
 import moe.fuqiuluo.qqinterface.servlet.FriendSvc.requestFriendSystemMsgNew
 import moe.fuqiuluo.qqinterface.servlet.GroupSvc.requestGroupSystemMsgNew
 import moe.fuqiuluo.qqinterface.servlet.TicketSvc.getLongUin
@@ -211,9 +203,12 @@ internal object PrimitiveListener {
                 LogCenter.log("onGroupTitleChange error: ${e.stackTraceToString()}", Level.WARN)
             }
         }
+        var detail5 = detail[5]
+        if (detail5 is ProtoList) {
+            detail5 = detail5.value.first { it is ProtoMap }
+        }
 
-        val targetUin = detail[5, 5].asLong
+        val targetUin = detail5[5].asLong
-
         var groupId:Long
         try {
             groupId = detail[4].asULong
@@ -222,7 +217,7 @@ internal object PrimitiveListener {
         }
 
         // 恭喜<{\"cmd\":5,\"data\":\"qq\",\"text}\":\"nickname\"}>获得群主授予的<{\"cmd\":1,\"data\":\"https://qun.qq.com/qqweb/m/qun/medal/detail.html?_wv=16777223&bid=2504&gc=gid&isnew=1&medal=302&uin=uin\",\"text\":\"title\",\"url\":\"https://qun.qq.com/qqweb/m/qun/medal/detail.html?_wv=16777223&bid=2504&gc=gid&isnew=1&medal=302&uin=uin\"}>头衔
-        val titleChangeInfo = detail[5, 2].asUtf8String
+        val titleChangeInfo = detail5[2].asUtf8String
         if (titleChangeInfo.indexOf("群主授予") == -1) {
             return
         }
@@ -457,14 +452,22 @@ internal object PrimitiveListener {
     private suspend fun onGroupBan(msgTime: Long, pb: ProtoMap) {
         val groupCode = pb[1, 3, 2, 1].asULong
         val operatorUid = pb[1, 3, 2, 4].asUtf8String
-        val targetUid = pb[1, 3, 2, 5, 3, 1].asUtf8String
+        val wholeBan = !pb.has(1, 3, 2, 5, 3, 1)
-        val duration = pb[1, 3, 2, 5, 3, 2].asInt
+        val targetUid = if (wholeBan) "" else pb[1, 3, 2, 5, 3, 1].asUtf8String
-        val operation = ContactHelper.getUinByUidAsync(operatorUid).toLong()
+        val rawDuration = pb[1, 3, 2, 5, 3, 2].asInt
-        val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
-        LogCenter.log("群禁言($groupCode): $operation -> $target, 时长 = ${duration}s")
 
+        val operation = ContactHelper.getUinByUidAsync(operatorUid).toLong()
+        val duration = if (wholeBan) -1 else rawDuration
+        val target = if (wholeBan) 0 else ContactHelper.getUinByUidAsync(targetUid).toLong()
+        val subType = if (rawDuration == 0) NoticeSubType.LiftBan else NoticeSubType.Ban
+
+        if (wholeBan) {
+            LogCenter.log("群全员禁言($groupCode): $operation -> ${if (subType == NoticeSubType.Ban) "开启" else "关闭"}")
+        } else {
+            LogCenter.log("群禁言($groupCode): $operation -> $target, 时长 = ${duration}s")
+        }
         if (!GlobalEventTransmitter.GroupNoticeTransmitter
-                .transGroupBan(msgTime, operation, target, groupCode, duration)
+                .transGroupBan(msgTime, subType, operation, target, groupCode, duration)
         ) {
             LogCenter.log("群禁言推送失败！", Level.WARN)
         }