mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-05-18 01:59:17 +08:00
PullMessageBySeqs
This commit is contained in:
parent
21e4fcf7df
commit
634247a5c7
@ -15,23 +15,47 @@ func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessag
|
|||||||
resp.NotificationMsgs = make(map[string]*sdkws.PullMsgs)
|
resp.NotificationMsgs = make(map[string]*sdkws.PullMsgs)
|
||||||
for _, seq := range req.SeqRanges {
|
for _, seq := range req.SeqRanges {
|
||||||
if !utils.IsNotification(seq.ConversationID) {
|
if !utils.IsNotification(seq.ConversationID) {
|
||||||
_, msgs, err := m.MsgDatabase.GetMsgBySeqsRange(ctx, req.UserID, seq.ConversationID, seq.Begin, seq.End, seq.Num)
|
minSeq, msgs, err := m.MsgDatabase.GetMsgBySeqsRange(ctx, req.UserID, seq.ConversationID, seq.Begin, seq.End, seq.Num)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.ZWarn(ctx, "GetMsgBySeqsRange error", err, "conversationID", seq.ConversationID, "seq", seq)
|
log.ZWarn(ctx, "GetMsgBySeqsRange error", err, "conversationID", seq.ConversationID, "seq", seq)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: msgs}
|
var isEnd bool
|
||||||
|
switch req.Order {
|
||||||
|
case sdkws.PullOrder_PullOrderAsc:
|
||||||
|
maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, seq.ConversationID)
|
||||||
|
if err != nil {
|
||||||
|
log.ZError(ctx, "GetMaxSeq error", err, "conversationID", seq.ConversationID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
isEnd = maxSeq <= seq.End
|
||||||
|
case sdkws.PullOrder_PullOrderDesc:
|
||||||
|
isEnd = seq.Begin <= minSeq
|
||||||
|
}
|
||||||
|
resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: msgs, IsEnd: isEnd}
|
||||||
} else {
|
} else {
|
||||||
var seqs []int64
|
var seqs []int64
|
||||||
for i := seq.Begin; i <= seq.End; i++ {
|
for i := seq.Begin; i <= seq.End; i++ {
|
||||||
seqs = append(seqs, i)
|
seqs = append(seqs, i)
|
||||||
}
|
}
|
||||||
_, notificationMsgs, err := m.MsgDatabase.GetMsgBySeqs(ctx, req.UserID, seq.ConversationID, seqs)
|
minSeq, notificationMsgs, err := m.MsgDatabase.GetMsgBySeqs(ctx, req.UserID, seq.ConversationID, seqs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.ZWarn(ctx, "GetMsgBySeqs error", err, "conversationID", seq.ConversationID, "seq", seq)
|
log.ZWarn(ctx, "GetMsgBySeqs error", err, "conversationID", seq.ConversationID, "seq", seq)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
resp.NotificationMsgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: notificationMsgs}
|
maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, seq.ConversationID)
|
||||||
|
if err != nil {
|
||||||
|
log.ZError(ctx, "GetMaxSeq error", err, "conversationID", seq.ConversationID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
var isEnd bool
|
||||||
|
switch req.Order {
|
||||||
|
case sdkws.PullOrder_PullOrderAsc:
|
||||||
|
isEnd = maxSeq <= seq.End
|
||||||
|
case sdkws.PullOrder_PullOrderDesc:
|
||||||
|
isEnd = seq.Begin <= minSeq
|
||||||
|
}
|
||||||
|
resp.NotificationMsgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: notificationMsgs, IsEnd: isEnd}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return resp, nil
|
return resp, nil
|
||||||
|
Loading…
x
Reference in New Issue
Block a user