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

super group add notification

Browse Source
This commit is contained in:
Gordon 2022-06-07 19:02:19 +08:00
parent 88c4cff50c
commit 7d0c8b0c5f
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/rpc/group/group.go
View File

@ -200,9 +200,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
if req.GroupInfo.GroupType != constant.SuperGroup { if req.GroupInfo.GroupType != constant.SuperGroup {
chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList) chat.GroupCreatedNotification(req.OperationID, req.OpUserID, groupId, okUserIDList)
} else { } else {
for _, userID := range okUserIDList { chat.SuperGroupNotification(req.OperationID, req.OpUserID, groupId)
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
} }
return resp, nil return resp, nil
@ -385,9 +383,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite
if groupInfo.GroupType != constant.SuperGroup { if groupInfo.GroupType != constant.SuperGroup {
chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList) chat.MemberInvitedNotification(req.OperationID, req.GroupID, req.OpUserID, req.Reason, okUserIDList)
} else { } else {
for _, userID := range okUserIDList { chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID)
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
} }
log.NewInfo(req.OperationID, "InviteUserToGroup rpc return ") 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 { if groupInfo.GroupType != constant.SuperGroup {
chat.MemberKickedNotification(req, okUserIDList) chat.MemberKickedNotification(req, okUserIDList)
} else { } else {
for _, userID := range okUserIDList { chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.GroupID)
chat.SuperGroupNotification(req.OperationID, req.OpUserID, userID)
}
} }
log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String()) log.NewInfo(req.OperationID, "GetGroupMemberList rpc return ", resp.String())
return &resp, nil return &resp, nil

4
internal/rpc/msg/send_msg.go
View File

@ -511,7 +511,7 @@ func Notification(n *NotificationMsg) {
msg.ClientMsgID = utils.GetMsgID(n.SendID) msg.ClientMsgID = utils.GetMsgID(n.SendID)
msg.Options = make(map[string]bool, 7) msg.Options = make(map[string]bool, 7)
switch n.SessionType { switch n.SessionType {
case constant.GroupChatType: case constant.GroupChatType, constant.SuperGroupChatType:
msg.RecvID = "" msg.RecvID = ""
msg.GroupID = n.RecvID msg.GroupID = n.RecvID
} }
@ -732,6 +732,8 @@ func Notification(n *NotificationMsg) {
unReadCount = config.Config.Notification.ConversationSetPrivate.Conversation.UnreadCount unReadCount = config.Config.Notification.ConversationSetPrivate.Conversation.UnreadCount
case constant.DeleteMessageNotification: case constant.DeleteMessageNotification:
reliabilityLevel = constant.ReliableNotificationNoMsg reliabilityLevel = constant.ReliableNotificationNoMsg
case constant.SuperGroupUpdateNotification:
reliabilityLevel = constant.UnreliableNotification
} }
switch reliabilityLevel { switch reliabilityLevel {
case constant.UnreliableNotification: case constant.UnreliableNotification:

9
internal/rpc/msg/super_group_notification.go
View File

@ -9,7 +9,8 @@ import (
//"github.com/golang/protobuf/proto" //"github.com/golang/protobuf/proto"
) )
func SuperGroupNotification(operationID, sendID, recvID string) { func SuperGroupNotification(operationID, sendID, groupID string) {
//var tips sdk.TipsComm //var tips sdk.TipsComm
//var err error //var err error
//marshaler := jsonpb.Marshaler{ //marshaler := jsonpb.Marshaler{
@ -20,10 +21,10 @@ func SuperGroupNotification(operationID, sendID, recvID string) {
//tips.JsonDetail, _ = marshaler.MarshalToString(m) //tips.JsonDetail, _ = marshaler.MarshalToString(m)
n := &NotificationMsg{ n := &NotificationMsg{
SendID: sendID, SendID: sendID,
RecvID: recvID, RecvID: groupID,
MsgFrom: constant.UserMsgType, MsgFrom: constant.SysMsgType,
ContentType: constant.SuperGroupUpdateNotification, ContentType: constant.SuperGroupUpdateNotification,
SessionType: constant.SingleChatType, SessionType: constant.SuperGroupChatType,
OperationID: operationID, OperationID: operationID,
} }
//n.Content, err = proto.Marshal(&tips) //n.Content, err = proto.Marshal(&tips)