From 8c7de0416bea15f0f6758e796ab20e169e4b1eae Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Fri, 30 Aug 2024 17:19:41 +0800
Subject: [PATCH] fix: fill opUser in invite tips (#2578)

* fix: fill opUser in invite tips

* fix: del code
---
 internal/rpc/group/notification.go | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/internal/rpc/group/notification.go b/internal/rpc/group/notification.go
index e87e7c495..4a69b6aed 100644
--- a/internal/rpc/group/notification.go
+++ b/internal/rpc/group/notification.go
@@ -535,28 +535,7 @@ 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 {
@@ -566,7 +545,11 @@ func (g *GroupNotificationSender) MemberEnterNotification(ctx context.Context, g
 	if err != nil {
 		return err
 	}
-	tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users, OpUser: opUser}
+
+	tips := &sdkws.MemberInvitedTips{Group: group, InvitedUserList: users}
+	if err = g.fillOpUser(ctx, &tips.OpUser, tips.Group.GroupID); err != nil {
+		return nil
+	}
 	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