From cac0aad1f241d0f29d1a3069a65ed4ba4bc04e47 Mon Sep 17 00:00:00 2001
From: super1207 <pengyao1210@gmail.com>
Date: Thu, 4 Jan 2024 19:40:01 +0800
Subject: [PATCH] fix groupid get

---
 .../service/listener/PrimitiveListener.kt     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 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
index 8142f4b..54ec8c0 100644
--- 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
@@ -214,7 +214,12 @@ internal object PrimitiveListener {
 
         val targetUin = detail[5, 5].asLong
 
-        val groupId = detail[4].asLong
+        var groupId:Long
+        try {
+            groupId = detail[4].asULong
+        }catch (e: ClassCastException){
+            groupId = detail[4].asList.value[0].asULong
+        }
 
         // 恭喜<{\"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
@@ -248,7 +253,12 @@ internal object PrimitiveListener {
             }
         }
 
-        val groupId = detail[4].asLong
+        var groupId:Long
+        try {
+            groupId = detail[4].asULong
+        }catch (e: ClassCastException){
+            groupId = detail[4].asList.value[0].asULong
+        }
         val mesSeq = detail[37].asInt
         val senderUin = detail[33, 5].asLong
         val operatorUin = detail[33, 6].asLong
@@ -301,7 +311,12 @@ internal object PrimitiveListener {
         var suffix: String? = null
         var actionImg: String? = null
         var rankImg: String? = null
-        val groupCode = detail[4].asULong
+        var groupCode:Long
+        try {
+            groupCode = detail[4].asULong
+        }catch (e: ClassCastException){
+            groupCode = detail[4].asList.value[0].asULong
+        }
         detail[26][7]
             .asList
             .value
@@ -468,7 +483,12 @@ internal object PrimitiveListener {
                     LogCenter.log("onGroupRecall error: ${e.stackTraceToString()}", Level.WARN)
                 }
             }
-            val groupCode = detail[4].asULong
+            var groupCode:Long
+            try {
+                groupCode = detail[4].asULong
+            }catch (e: ClassCastException){
+                groupCode = detail[4].asList.value[0].asULong
+            }
             val operatorUid = detail[11, 1].asUtf8String
             val targetUid = detail[11, 3, 6].asUtf8String
             val msgSeq = detail[11, 3, 1].asLong
@@ -578,4 +598,4 @@ internal object PrimitiveListener {
         }
     }
 
-}
\ No newline at end of file
+}