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

Update group application list for group administrator

Browse Source
This commit is contained in:
skiffer-git 2022-12-13 14:43:09 +08:00
parent 2dab70697c
commit a98f89a4e7
3 changed files with 587 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/rpc/msg/group_notification.go
View File

@ -435,7 +435,20 @@ func GroupApplicationAcceptedNotification(req *pbGroup.GroupApplicationResponseR
log.Error(req.OperationID, "setOpUserInfo failed", req.OpUserID, req.GroupID, GroupApplicationAcceptedTips.OpUser) log.Error(req.OperationID, "setOpUserInfo failed", req.OpUserID, req.GroupID, GroupApplicationAcceptedTips.OpUser)
return return
} }
groupNotification(constant.GroupApplicationAcceptedNotification, &GroupApplicationAcceptedTips, req.OpUserID, "", req.FromUserID, req.OperationID) groupNotification(constant.GroupApplicationAcceptedNotification, &GroupApplicationAcceptedTips, req.OpUserID, "", req.FromUserID, req.OperationID)
adminList, err := imdb.GetOwnerManagerByGroupID(req.GroupID)
if err != nil {
log.Error(req.OperationID, "GetOwnerManagerByGroupID failed", req.GroupID)
return
}
for _, v := range adminList {
if v.UserID == req.OpUserID {
continue
}
GroupApplicationAcceptedTips.ReceiverAs = 1
groupNotification(constant.GroupApplicationAcceptedNotification, &GroupApplicationAcceptedTips, req.OpUserID, "", v.UserID, req.OperationID)
}
} }
func GroupApplicationRejectedNotification(req *pbGroup.GroupApplicationResponseReq) { func GroupApplicationRejectedNotification(req *pbGroup.GroupApplicationResponseReq) {
@ -449,6 +462,18 @@ func GroupApplicationRejectedNotification(req *pbGroup.GroupApplicationResponseR
return return
} }
groupNotification(constant.GroupApplicationRejectedNotification, &GroupApplicationRejectedTips, req.OpUserID, "", req.FromUserID, req.OperationID) groupNotification(constant.GroupApplicationRejectedNotification, &GroupApplicationRejectedTips, req.OpUserID, "", req.FromUserID, req.OperationID)
adminList, err := imdb.GetOwnerManagerByGroupID(req.GroupID)
if err != nil {
log.Error(req.OperationID, "GetOwnerManagerByGroupID failed", req.GroupID)
return
}
for _, v := range adminList {
if v.UserID == req.OpUserID {
continue
}
GroupApplicationRejectedTips.ReceiverAs = 1
groupNotification(constant.GroupApplicationRejectedNotification, &GroupApplicationRejectedTips, req.OpUserID, "", v.UserID, req.OperationID)
}
} }
func GroupOwnerTransferredNotification(req *pbGroup.TransferGroupOwnerReq) { func GroupOwnerTransferredNotification(req *pbGroup.TransferGroupOwnerReq) {

890
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pkg/proto/sdk_ws/ws.proto
View File

@ -330,6 +330,7 @@ message GroupApplicationAcceptedTips{
GroupInfo group = 1; GroupInfo group = 1;
GroupMemberFullInfo opUser = 2; GroupMemberFullInfo opUser = 2;
string handleMsg = 4; string handleMsg = 4;
int32 receiverAs = 5; // admin(==1) or applicant(==0)
} }
// OnApplicationGroupRejected() // OnApplicationGroupRejected()
@ -337,6 +338,7 @@ message GroupApplicationRejectedTips{
GroupInfo group = 1; GroupInfo group = 1;
GroupMemberFullInfo opUser = 2; GroupMemberFullInfo opUser = 2;
string handleMsg = 4; string handleMsg = 4;
int32 receiverAs = 5; // admin(==1) or applicant(==0)
} }
// OnTransferGroupOwner() // OnTransferGroupOwner()