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

add callback and fix cache

Browse Source
This commit is contained in:
wangchuxiao 2022-11-22 14:18:57 +08:00
parent 53d7f60ebc
commit 07cdd8bbab
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,10 +1111,13 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq)
if err := rocksCache.DelJoinedSuperGroupIDListFromCache(req.OpUserID); err != nil { if err := rocksCache.DelJoinedSuperGroupIDListFromCache(req.OpUserID); err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.OpUserID) log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.OpUserID)
} }
if err := rocksCache.DelGroupMemberListHashFromCache(req.GroupID); err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, err.Error())
}
chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID) chat.SuperGroupNotification(req.OperationID, req.OpUserID, req.OpUserID)
} }
log.NewInfo(req.OperationID, "rpc QuitGroup return ", pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}) log.NewInfo(req.OperationID, "rpc QuitGroup return ", pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{}})
return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil return &pbGroup.QuitGroupResp{CommonResp: &pbGroup.CommonResp{}}, nil
} }
func hasAccess(req *pbGroup.SetGroupInfoReq) bool { func hasAccess(req *pbGroup.SetGroupInfoReq) bool {

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

@ -416,8 +416,6 @@ func MemberQuitNotification(req *pbGroup.QuitGroupReq) {
} }
groupNotification(constant.MemberQuitNotification, &MemberQuitTips, req.OpUserID, req.GroupID, "", req.OperationID) groupNotification(constant.MemberQuitNotification, &MemberQuitTips, req.OpUserID, req.GroupID, "", req.OperationID)
// groupNotification(constant.MemberQuitNotification, &MemberQuitTips, req.OpUserID, "", req.OpUserID, req.OperationID)
} }
//message ApplicationProcessedTips{ //message ApplicationProcessedTips{

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

@ -174,9 +174,13 @@ func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, s
if token_verify.IsManagerUserID(data.MsgData.SendID) { if token_verify.IsManagerUserID(data.MsgData.SendID) {
return true, 0, "", userIDList return true, 0, "", userIDList
} }
if !utils.IsContain(data.MsgData.SendID, userIDList) { if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
//return returnMsg(&replay, pb, 202, "you are not in group", "", 0) return true, 0, "", userIDList
return false, 202, "you are not in group", nil } else {
if !utils.IsContain(data.MsgData.SendID, userIDList) {
//return returnMsg(&replay, pb, 202, "you are not in group", "", 0)
return false, 202, "you are not in group", nil
}
} }
isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID) isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID)
if err != nil { if err != nil {
@ -233,9 +237,13 @@ func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, s
if token_verify.IsManagerUserID(data.MsgData.SendID) { if token_verify.IsManagerUserID(data.MsgData.SendID) {
return true, 0, "", userIDList return true, 0, "", userIDList
} }
if !utils.IsContain(data.MsgData.SendID, userIDList) { if data.MsgData.ContentType <= constant.NotificationEnd && data.MsgData.ContentType >= constant.NotificationBegin {
//return returnMsg(&replay, pb, 202, "you are not in group", "", 0) return true, 0, "", userIDList
return false, 202, "you are not in group", nil } else {
if !utils.IsContain(data.MsgData.SendID, userIDList) {
//return returnMsg(&replay, pb, 202, "you are not in group", "", 0)
return false, 202, "you are not in group", nil
}
} }
isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID) isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID)
if err != nil { if err != nil {