Merge remote-tracking branch 'origin/master'

whitechi73 · Nov 25, 2023 · 544e216 · 544e216
2 parents 4fedab7 + 75a567d
commit 544e216
Showing 1 changed file with 14 additions and 47 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt
@@ -81,13 +81,7 @@ internal object PrimitiveListener {
             732 -> when(subType) {
                 12 -> onGroupBan(msgTime, pb)
                 16 -> onGroupTitleChange(msgTime, pb)
-                17 -> {
-                    try {
-                        onGroupRecall(msgTime, pb)
-                        // invite
-                        onGroupMemIncreased(msgTime, pb)
-                    } finally { }
-                }
+                17 -> onGroupRecall(msgTime, pb)
                 20 -> onGroupPoke(msgTime, pb)
                 21 -> onEssenceMessage(msgTime, pb)
             }
@@ -287,47 +281,20 @@ internal object PrimitiveListener {
     }
 
     private suspend fun onGroupMemIncreased(time: Long, pb: ProtoMap) {
-        when(pb[1, 2, 1].asInt) {
-            732 -> {
-                // invite
-                val groupCode = pb[1, 3, 2, 4].asULong
-                lateinit var target: String
-                lateinit var operation: String
-                pb[1, 3, 2, 26, 7].asList
-                    .value
-                    .forEach {
-                        val value = it[2].asUtf8String
-                        when (it[1].asUtf8String) {
-                            "invitee" -> operation = value
-                            "invitor" -> target = value
-                        }
-                    }
-                val type = 131
-                LogCenter.log("群成员增加($groupCode): $target, type = $type")
+        val groupCode = pb[1, 3, 2, 1].asULong
+        val targetUid = pb[1, 3, 2, 3].asUtf8String
+        val type = pb[1, 3, 2, 4].asInt
+        val operation = ContactHelper.getUinByUidAsync(pb[1, 3, 2, 5].asUtf8String).toLong()
+        val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
+        LogCenter.log("群成员增加($groupCode): $target, type = $type")
 
-                if(!GlobalEventTransmitter.GroupNoticeTransmitter
-                        .transGroupMemberNumChanged(time, target.toLong(), groupCode, operation.toLong(), NoticeType.GroupMemIncrease, NoticeSubType.Invite)) {
-                    LogCenter.log("群成员增加推送失败！", Level.WARN)
-                }
-            }
-            33 -> {
-                // approve
-                val groupCode = pb[1, 3, 2, 1].asULong
-                val targetUid = pb[1, 3, 2, 3].asUtf8String
-                val type = pb[1, 3, 2, 4].asInt
-                val operation = ContactHelper.getUinByUidAsync(pb[1, 3, 2, 5].asUtf8String).toLong()
-                val target = ContactHelper.getUinByUidAsync(targetUid).toLong()
-                LogCenter.log("群成员增加($groupCode): $target, type = $type")
-
-                if(!GlobalEventTransmitter.GroupNoticeTransmitter
-                        .transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemIncrease, when(type) {
-                            130 -> NoticeSubType.Approve
-                            131 -> NoticeSubType.Invite
-                            else -> NoticeSubType.Approve
-                        })) {
-                    LogCenter.log("群成员增加推送失败！", Level.WARN)
-                }
-            }
+        if(!GlobalEventTransmitter.GroupNoticeTransmitter
+                .transGroupMemberNumChanged(time, target, groupCode, operation, NoticeType.GroupMemIncrease, when(type) {
+                    130 -> NoticeSubType.Approve
+                    131 -> NoticeSubType.Invite
+                    else -> NoticeSubType.Approve
+                })) {
+            LogCenter.log("群成员增加推送失败！", Level.WARN)
         }
     }