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

fix groupMuted send msg

Browse Source
This commit is contained in:
wangchuxiao 2022-11-29 14:41:20 +08:00
parent ad2df2f36f
commit 6f22b37e1d
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/push/logic/push_to_client.go
View File

@ -70,7 +70,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
wsResult = append(wsResult, reply.SinglePushResult...) wsResult = append(wsResult, reply.SinglePushResult...)
} }
} }
log.NewInfo(pushMsg.OperationID, "push_result", wsResult, "sendData", pushMsg.MsgData) log.NewInfo(pushMsg.OperationID, "push_result", wsResult, "sendData", pushMsg.MsgData, "isOfflinePush", isOfflinePush)
successCount++ successCount++
if isOfflinePush && pushMsg.PushToUserID != pushMsg.MsgData.SendID { if isOfflinePush && pushMsg.PushToUserID != pushMsg.MsgData.SendID {
// save invitation info for offline push // save invitation info for offline push

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

@ -107,6 +107,17 @@ func userIsMuteInGroup(groupID, userID string) (bool, error) {
return false, nil return false, nil
} }
func groupIsMuted(groupID string) (bool, error) {
groupInfo, err := rocksCache.GetGroupInfoFromCache(groupID)
if err != nil {
return false, utils.Wrap(err, "GetGroupInfoFromCache failed")
}
if groupInfo.Status == constant.GroupStatusMuted {
return true, nil
}
return false, nil
}
func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string) { func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, string, []string) {
switch data.MsgData.SessionType { switch data.MsgData.SessionType {
case constant.SingleChatType: case constant.SingleChatType:
@ -182,7 +193,15 @@ func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, s
return false, 202, "you are not in group", nil return false, 202, "you are not in group", nil
} }
} }
isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID) isMute, err := groupIsMuted(data.MsgData.GroupID)
if err != nil {
errMsg := data.OperationID + err.Error()
return false, 223, errMsg, nil
}
if isMute {
return false, 225, "group id muted", nil
}
isMute, err = userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID)
if err != nil { if err != nil {
errMsg := data.OperationID + err.Error() errMsg := data.OperationID + err.Error()
return false, 223, errMsg, nil return false, 223, errMsg, nil
@ -245,7 +264,15 @@ func (rpc *rpcChat) messageVerification(data *pbChat.SendMsgReq) (bool, int32, s
return false, 202, "you are not in group", nil return false, 202, "you are not in group", nil
} }
} }
isMute, err := userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID) isMute, err := groupIsMuted(data.MsgData.GroupID)
if err != nil {
errMsg := data.OperationID + err.Error()
return false, 223, errMsg, nil
}
if isMute {
return false, 225, "group id muted", nil
}
isMute, err = userIsMuteInGroup(data.MsgData.GroupID, data.MsgData.SendID)
if err != nil { if err != nil {
errMsg := data.OperationID + err.Error() errMsg := data.OperationID + err.Error()
return false, 223, errMsg, nil return false, 223, errMsg, nil