This commit is contained in:
wangchuxiao 2023-05-06 11:13:38 +08:00
parent 4509530859
commit a62335a910

View File

@ -149,24 +149,18 @@ func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessag
if err != nil { if err != nil {
return nil, err return nil, err
} }
resp.Msgs = append(resp.Msgs, &sdkws.PullMsgs{ resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: msgs}
ConversationID: seq.ConversationID,
Msgs: msgs,
})
} 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)
} }
msgs, err := m.notificationDatabase.GetMsgBySeqs(ctx, seq.ConversationID, seqs) notificationMsgs, err := m.notificationDatabase.GetMsgBySeqs(ctx, seq.ConversationID, seqs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
resp.Msgs = append(resp.Msgs, &sdkws.PullMsgs{ resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: notificationMsgs}
ConversationID: seq.ConversationID,
Msgs: msgs,
IsNotification: true,
})
} }
} }
return resp, nil return resp, nil