IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-03 00:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup

Browse Source
This commit is contained in:
wangchuxiao
2022-06-08 15:07:19 +08:00
parent 276328e0fd 1bcd091330
commit ed7d2bbdd7
6 changed files with 295 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/group/group.go
+3 -9
View File
@@ -200,9 +200,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
if req.GroupInfo.GroupType != constant.SuperGroup {
chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList)
} else {
for _, userID := range okUserIDList {
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
chat.SuperGroupNotification(req.OperationID, req.OpUserID, groupId)
}
return resp, nil
@@ -385,9 +383,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
if groupInfo.GroupType != constant.SuperGroup {
chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList)
} else {
for _, userID := range okUserIDList {
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID)
}
log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ")
@@ -589,9 +585,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou
if groupInfo.GroupType != constant.SuperGroup {
chat.MemberKickedNotification(req, okUserIDList)
} else {
for _, userID := range okUserIDList {
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID)
}
log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String())
return &resp, nil