fix: invitation to join group notification opuser is null (#2562)

* fix: GroupApplicationAcceptedNotification * fix: GroupApplicationAcceptedNotification * fix: NotificationUserInfoUpdate * cicd: robot automated Change * fix: component * fix: getConversationInfo * feat: cron task * feat: cron task * feat: cron task * feat: cron task * feat: cron task * fix: minio config url recognition error * update gomake version * update gomake version * fix: seq conversion bug * fix: redis pipe exec * fix: ImportFriends * fix: A large number of logs keysAndValues length is not even * feat: mark read aggregate write * feat: online status supports redis cluster * feat: online status supports redis cluster * feat: online status supports redis cluster * merge * merge * read seq is written to mongo * read seq is written to mongo * fix: invitation to join group notification --------- Co-authored-by: withchao <[email protected]>
openimsdk · Aug 27, 2024 · bcd5324 · bcd5324
1 parent 85614da
commit bcd5324
Showing 1 changed file with 23 additions and 2 deletions.
diff --git 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