blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-29 22:11:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

conversation

Browse Source
This commit is contained in:
wangchuxiao 2023-05-04 16:06:17 +08:00
parent 9c76988225
commit 5d617cc240
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/rpc/msg/server.go
View File

@ -24,6 +24,7 @@ type MessageInterceptorChain []MessageInterceptorFunc
type msgServer struct { type msgServer struct {
RegisterCenter discoveryregistry.SvcDiscoveryRegistry RegisterCenter discoveryregistry.SvcDiscoveryRegistry
MsgDatabase controller.MsgDatabase MsgDatabase controller.MsgDatabase
notificationDatabase controller.NotificationDatabase
ExtendMsgDatabase controller.ExtendMsgDatabase ExtendMsgDatabase controller.ExtendMsgDatabase
Group *rpcclient.GroupClient Group *rpcclient.GroupClient
User *rpcclient.UserClient User *rpcclient.UserClient
@ -161,6 +162,7 @@ func (m *msgServer) GetMaxAndMinSeq(ctx context.Context, req *sdkws.GetMaxAndMin
func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) { func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessageBySeqsReq) (*sdkws.PullMessageBySeqsResp, error) {
resp := &sdkws.PullMessageBySeqsResp{} resp := &sdkws.PullMessageBySeqsResp{}
for _, seq := range req.SeqRanges { for _, seq := range req.SeqRanges {
if !seq.IsNotification {
msgs, err := m.MsgDatabase.GetMsgBySeqsRange(ctx, seq.ConversationID, seq.Begin, seq.End, seq.Num) msgs, err := m.MsgDatabase.GetMsgBySeqsRange(ctx, seq.ConversationID, seq.Begin, seq.End, seq.Num)
if err != nil { if err != nil {
return nil, err return nil, err
@ -169,6 +171,22 @@ func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessag
ConversationID: seq.ConversationID, ConversationID: seq.ConversationID,
Msgs: msgs, Msgs: msgs,
}) })
} else {
var seqs []int64
for i := seq.Begin; i <= seq.End; i++ {
seqs = append(seqs, i)
}
msgs, err := m.notificationDatabase.GetMsgBySeqs(ctx, seq.ConversationID, seqs)
if err != nil {
return nil, err
}
resp.Msgs = append(resp.Msgs, &sdkws.PullMsgs{
ConversationID: seq.ConversationID,
Msgs: msgs,
IsNotification: true,
})
}
} }
return resp, nil return resp, nil
} }