IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-08 19:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

msg

Browse Source
This commit is contained in:
wangchuxiao
2023-05-06 18:51:10 +08:00
parent 287b028ba8
commit 121523626d
8 changed files with 1065 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rpc/msg/server.go
+9 -2
View File
@@ -132,12 +132,19 @@ func (m *msgServer) GetMaxSeq(ctx context.Context, req *sdkws.GetMaxSeqReq) (*sd
if err != nil {
return nil, err
}
seqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs)
maxSeqs, err := m.MsgDatabase.GetMaxSeqs(ctx, conversationIDs)
if err != nil {
log.ZWarn(ctx, "GetMaxSeqs error", err, "conversationIDs", conversationIDs)
return nil, err
}
minSeqs, err := m.MsgDatabase.GetMinSeqs(ctx, conversationIDs)
if err != nil {
log.ZWarn(ctx, "GetMinSeqs error", err, "conversationIDs", conversationIDs)
return nil, err
}
resp := new(sdkws.GetMaxSeqResp)
resp.MaxSeqs = seqs
resp.MaxSeqs = maxSeqs
resp.MinSeqs = minSeqs
return resp, nil
}
internal/rpc/user/user.go
+4
View File
@@ -2,6 +2,7 @@ package user
import (
"context"
"strings"
"time"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
@@ -179,6 +180,9 @@ func (s *userServer) UserRegister(ctx context.Context, req *pbuser.UserRegisterR
if user.UserID == "" {
return nil, errs.ErrArgs.Wrap("userID is empty")
}
if strings.Contains(user.UserID, ":") {
return nil, errs.ErrArgs.Wrap("userID contains ':' is invalid userID")
}
userIDs = append(userIDs, user.UserID)
}
exist, err := s.IsExist(ctx, userIDs)