From ec132d224eaeb891eed6eb9e70f9087d0ceddb98 Mon Sep 17 00:00:00 2001
From: whitechi73 <whitechi73@outlook.com>
Date: Tue, 23 Jan 2024 00:36:44 +0800
Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20=E4=B8=BA=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0`user=5Fuid`=20#150?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shamrock/remote/service/api/GlobalEventTransmitter.kt   | 6 ++++--
 .../shamrock/remote/service/data/push/NoticeEvent.kt        | 1 +
 .../shamrock/remote/service/listener/PrimitiveListener.kt   | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
index 649aff2..d11add6 100644
--- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/GlobalEventTransmitter.kt
@@ -481,7 +481,8 @@ internal object GlobalEventTransmitter: BaseSvc() {
 
         suspend fun transGroupApply(
             time: Long,
-            operator: Long,
+            applier: Long,
+            applierUid: String,
             reason: String,
             groupCode: Long,
             flag: String,
@@ -492,7 +493,8 @@ internal object GlobalEventTransmitter: BaseSvc() {
                 selfId = app.longAccountUin,
                 postType = PostType.Request,
                 type = RequestType.Group,
-                userId = operator,
+                userId = applier,
+                userUid = applierUid,
                 comment = reason,
                 groupId = groupCode,
                 subType = subType,
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt
index c0925a6..f590042 100644
--- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/data/push/NoticeEvent.kt
@@ -112,6 +112,7 @@ internal data class RequestEvent(
     @SerialName("sub_type") val subType: RequestSubType = RequestSubType.None,
     @SerialName("group_id") val groupId: Long = -1,
     @SerialName("user_id") val userId: Long = -1,
+    @SerialName("user_uid") val userUid: String = "",
     @SerialName("comment") val comment: String = "",
     @SerialName("flag") val flag: String? = null,
 )
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 631a18a..34c431a 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
@@ -560,7 +560,7 @@ internal object PrimitiveListener {
                     "$time;$groupCode;$applier"
                 }
                 if (!GlobalEventTransmitter.RequestTransmitter
-                        .transGroupApply(time, applier, reason, groupCode, flag, RequestSubType.Add)
+                        .transGroupApply(time, applier, applierUid, reason, groupCode, flag, RequestSubType.Add)
                 ) {
                     LogCenter.log("入群申请推送失败！", Level.WARN)
                 }
@@ -591,7 +591,7 @@ internal object PrimitiveListener {
                     "$time;$groupCode;$applier"
                 }
                 if (!GlobalEventTransmitter.RequestTransmitter
-                        .transGroupApply(time, applier, "", groupCode, flag, RequestSubType.Add)
+                        .transGroupApply(time, applier, applierUid, "", groupCode, flag, RequestSubType.Add)
                 ) {
                     LogCenter.log("邀请入群申请推送失败！", Level.WARN)
                 }
@@ -618,7 +618,7 @@ internal object PrimitiveListener {
             "$time;$groupCode;$uin"
         }
         if (!GlobalEventTransmitter.RequestTransmitter
-                .transGroupApply(time, invitor, "", groupCode, flag, RequestSubType.Invite)
+                .transGroupApply(time, invitor,  invitorUid, "", groupCode, flag, RequestSubType.Invite)
         ) {
             LogCenter.log("邀请入群推送失败！", Level.WARN)
         }