Shamrock: fix wrong types of get_group_system_msg

whitechi73 · Nov 22, 2023 · 89154f0 · 89154f0
1 parent 5218c15
commit 89154f0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/action/handlers/GetGroupSystemMsg.kt
@@ -21,9 +21,9 @@ internal object GetGroupSystemMsg: IActionHandler() {
         )
         list?.forEach {
             when(it.msg.group_msg_type.get()) {
-                22, 2 -> {
-                    // invite
-                    msgs.invited += GroupRequest (
+                22, 1 -> {
+                    // join 进群消息
+                    msgs.join += GroupRequest (
                         msgSeq = it.msg_seq.get(),
                         invitorUin = it.msg.action_uin.get(),
                         invitorNick = it.msg.action_uin_nick.get(),
@@ -32,23 +32,23 @@ internal object GetGroupSystemMsg: IActionHandler() {
                         checked = it.msg.msg_decided.get().isNotBlank(),
                         actor = it.msg.actor_uin.get(),
                         requesterUin = it.req_uin.get(),
-                        requesterNick = "",
-                        message = "",
+                        requesterNick = it.msg.req_uin_nick.get(),
+                        message = it.msg.msg_additional.get(),
                         flag = "${it.msg_seq.get()};${it.msg.group_code.get()};${it.req_uin.get()}"
                     )
                 }
-                1 -> {
-                    // add
-                    msgs.join += GroupRequest (
+                2 -> {
+                    // invite 别人邀请我
+                    msgs.invited += GroupRequest (
                         msgSeq = it.msg_seq.get(),
                         invitorUin = null,
                         invitorNick = null,
                         groupId = it.msg.group_code.get(),
                         groupName = it.msg.group_name.get(),
                         checked = it.msg.msg_decided.get().isNotBlank(),
                         actor = it.msg.actor_uin.get(),
-                        requesterUin = it.req_uin.get(),
-                        requesterNick = it.msg.req_uin_nick.get(),
+                        requesterUin = 0,
+                        requesterNick = "",
                         message = it.msg.msg_additional.get(),
                         flag = "${it.msg_seq.get()};${it.msg.group_code.get()};${it.req_uin.get()}"
                     )