From e7a4ef38f2a59fbd2f2b64d9a3786f5f04430165 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Tue, 27 Aug 2024 12:12:06 +0800
Subject: [PATCH] fix: invitation to join group notification

---
 internal/rpc/group/notification.go | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/internal/rpc/group/notification.go b/internal/rpc/group/notification.go
index 44eb6f9e32..e87e7c495b 100644
--- a/internal/rpc/group/notification.go
+++ b/internal/rpc/group/notification.go
@@ -535,7 +535,28 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
 	if err := g.conversationRpcClient.GroupChatFirstCreateConversation(ctx, groupID, entrantUserID); err != nil {
 		return err
 	}
-
+	opUserID := mcontext.GetOpUserID(ctx)
+	var opUser *sdkws.GroupMemberFullInfo
+	if authverify.IsAppManagerUid(ctx, g.config.Share.IMAdminUserID) {
+		opUser = &sdkws.GroupMemberFullInfo{
+			GroupID:        groupID,
+			UserID:         opUserID,
+			AppMangerLevel: constant.AppAdmin,
+		}
+	} else {
+		users, err := g.getGroupMembers(ctx, groupID, []string{opUserID})
+		if err != nil {
+			return err
+		}
+		if len(users) == 0 {
+			opUser = &sdkws.GroupMemberFullInfo{
+				GroupID: groupID,
+				UserID:  opUserID,
+			}
+		} else {
+			opUser = users[0]
+		}
+	}
 	var group *sdkws.GroupInfo
 	group, err = g.getGroupInfo(ctx, groupID)
 	if err != nil {
@@ -545,7 +566,7 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users}
+	tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users, OpUser: opUser}
 	g.setVersion(ctx, &tips.GroupMemberVersion, &tips.GroupMemberVersionID, database.GroupMemberVersionName, tips.Group.GroupID)
 	g.Notification(ctx, mcontext.GetOpUserID(ctx), group.GroupID, constant.MemberInvitedNotification, tips)
 	return nil