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

notification

Browse Source
This commit is contained in:
skiffer-git 2021-12-14 15:11:35 +08:00
parent 7adde6a0a9
commit b84dbbc3b8
3 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Open-IM-SDK-Core

@ -1 +1 @@
Subproject commit 369973051405db1102fd1b99a0226ab79b9922e0 Subproject commit a85c10dbffbb797b5b2091e209ff67a5534b9bfc

6
internal/rpc/chat/send_msg.go
View File

@ -226,9 +226,9 @@ func CreateGroupNotification(sendID string, creator im_mysql_model.User, group i
msg.Content = utils.StructToJsonString(tip) msg.Content = utils.StructToJsonString(tip)
var offlinePushInfo open_im_sdk.OfflinePushInfo var offlinePushInfo open_im_sdk.OfflinePushInfo
offlinePushInfo.Title = "create group title" offlinePushInfo.Title = config.Config.Notification.CreateGroup.Title
offlinePushInfo.Desc = "create group desc" offlinePushInfo.Desc = config.Config.Notification.CreateGroup.Desc
offlinePushInfo.Ext = "create group ext" offlinePushInfo.Ext = config.Config.Notification.CreateGroup.Ext
Notification(&msg, false, offlinePushInfo) Notification(&msg, false, offlinePushInfo)
} }

43
internal/rpc/group/create_group.go
View File

@ -1,8 +1,6 @@
package group package group
import ( import (
"Open_IM/internal/push/content_struct"
"Open_IM/internal/push/logic"
"Open_IM/internal/rpc/chat" "Open_IM/internal/rpc/chat"
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant" "Open_IM/pkg/common/constant"
@ -11,9 +9,7 @@ import (
"Open_IM/pkg/common/log" "Open_IM/pkg/common/log"
"Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/token_verify"
"Open_IM/pkg/grpc-etcdv3/getcdv3" "Open_IM/pkg/grpc-etcdv3/getcdv3"
pbChat "Open_IM/pkg/proto/chat"
pbGroup "Open_IM/pkg/proto/group" pbGroup "Open_IM/pkg/proto/group"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
"context" "context"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -71,7 +67,7 @@ func (s *groupServer) Run() {
} }
func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) { func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupReq) (*pbGroup.CreateGroupResp, error) {
log.InfoByArgs("rpc create group is server,args=%s", req.String()) log.NewInfo(req.OperationID, "rpc create group is server,args=%s", req.String())
var ( var (
groupId string groupId string
) )
@ -133,49 +129,24 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
} }
} }
if isMagagerFlag == 1 {
//type NotificationContent struct {
// IsDisplay int32 `json:"isDisplay"`
// DefaultTips string `json:"defaultTips"`
// Detail string `json:"detail"`
//} n := NotificationContent{
// IsDisplay: 1,
// DefaultTips: "You have joined the group chat:" + createGroupResp.Data.GroupName,
// Detail: createGroupResp.Data.GroupId,
// }
////Push message when create group chat
n := content_struct.NotificationContent{1, req.GroupName, groupId}
logic.SendMsgByWS(&pbChat.WSToMsgSvrChatMsg{
SendID: claims.UID,
RecvID: groupId,
Content: n.ContentToString(),
SendTime: utils.GetCurrentTimestampByNano(),
MsgFrom: constant.SysMsgType, //Notification message identification
ContentType: constant.CreateGroupTip, //Add friend flag
SessionType: constant.GroupChatType,
OperationID: req.OperationID,
})
}
var tip open_im_sdk.CreateGroupTip
groupInfo, err := im_mysql_model.FindGroupInfoByGroupId(groupId) groupInfo, err := im_mysql_model.FindGroupInfoByGroupId(groupId)
if err != nil { if err != nil {
log.NewError(req.OperationID, "FindGroupInfoByGroupId failed ", groupId)
return &pbGroup.CreateGroupResp{ErrorCode: constant.ErrCreateGroup.ErrCode, ErrorMsg: constant.ErrCreateGroup.ErrMsg}, nil return &pbGroup.CreateGroupResp{ErrorCode: constant.ErrCreateGroup.ErrCode, ErrorMsg: constant.ErrCreateGroup.ErrMsg}, nil
} }
creatorInfo, err := im_mysql_model.FindUserByUID(claims.UID) creatorInfo, err := im_mysql_model.FindUserByUID(claims.UID)
if err != nil { if err != nil {
log.NewError(req.OperationID, "FindUserByUID failed ", claims.UID)
return &pbGroup.CreateGroupResp{ErrorCode: constant.ErrCreateGroup.ErrCode, ErrorMsg: constant.ErrCreateGroup.ErrMsg}, nil
} }
memberList, err := im_mysql_model.FindGroupMemberListByGroupId(groupId) memberList, err := im_mysql_model.FindGroupMemberListByGroupId(groupId)
if err != nil { if err != nil {
log.NewError(req.OperationID, "FindGroupMemberListByGroupId failed ", groupId)
} }
chat.CreateGroupNotification(claims.UID, *creatorInfo, *groupInfo, memberList)
log.Info(req.Token, req.OperationID, "rpc create group success return") log.NewInfo(req.OperationID, "creator, group, member list: ", *creatorInfo, *groupInfo, memberList)
chat.CreateGroupNotification(claims.UID, *creatorInfo, *groupInfo, memberList)
return &pbGroup.CreateGroupResp{GroupID: groupId}, nil return &pbGroup.CreateGroupResp{GroupID: groupId}, nil
} }