diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index b549bf91a..628b8df0d 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -505,7 +505,7 @@ func (p *Pusher) getOfflinePushInfos(conversationID string, msg *sdkws.MsgData) case constant.AtText: ac := atContent{} _ = utils.JsonStringToStruct(string(msg.Content), &ac) - if utils.IsContain(conversationID, ac.AtUserList) { + if utils.Contain(conversationID, ac.AtUserList...) { title = constant.ContentType2PushContent[constant.AtText] + constant.ContentType2PushContent[constant.Common] } else { title = constant.ContentType2PushContent[constant.GroupMsg] diff --git a/internal/rpc/msg/send.go b/internal/rpc/msg/send.go index 8005630dd..5f1a631fb 100644 --- a/internal/rpc/msg/send.go +++ b/internal/rpc/msg/send.go @@ -47,10 +47,10 @@ func (m *msgServer) SendMsg(ctx context.Context, req *pbmsg.SendMsgReq) (resp *p case constant.SuperGroupChatType: return m.sendMsgSuperGroupChat(ctx, req) default: - return nil, errs.ErrArgs.Wrap("unknown sessionType") + return nil, errs.ErrArgs.WrapMsg("unknown sessionType") } } else { - return nil, errs.ErrArgs.Wrap("msgData is nil") + return nil, errs.ErrArgs.WrapMsg("msgData is nil") } } @@ -96,7 +96,7 @@ func (m *msgServer) setConversationAtInfo(nctx context.Context, msg *sdkws.MsgDa ConversationType: msg.SessionType, GroupID: msg.GroupID, } - tagAll := utils.IsContain(constant.AtAllString, msg.AtUserIDList) + tagAll := utils.Contain(constant.AtAllString, msg.AtUserIDList...) if tagAll { memberUserIDList, err := m.GroupLocalCache.GetGroupMemberIDs(ctx, msg.GroupID) if err != nil { diff --git a/internal/rpc/msg/seq.go b/internal/rpc/msg/seq.go index dfc2ad0b1..dd65a542d 100644 --- a/internal/rpc/msg/seq.go +++ b/internal/rpc/msg/seq.go @@ -20,10 +20,7 @@ import ( pbmsg "github.com/OpenIMSDK/protocol/msg" ) -func (m *msgServer) GetConversationMaxSeq( - ctx context.Context, - req *pbmsg.GetConversationMaxSeqReq, -) (resp *pbmsg.GetConversationMaxSeqResp, err error) { +func (m *msgServer) GetConversationMaxSeq(ctx context.Context, req *pbmsg.GetConversationMaxSeqReq) (resp *pbmsg.GetConversationMaxSeqResp, err error) { maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID) if err != nil { return nil, err