blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-27 22:12:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: invitation to join group notification

Browse Source
This commit is contained in:
withchao 2024-08-27 12:12:06 +08:00
parent bbbb6829c7
commit e7a4ef38f2
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/rpc/group/notification.go
View File

@ -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