From a62335a910b005f076cb2634d9b69cddac79e161 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Sat, 6 May 2023 11:13:38 +0800 Subject: [PATCH] msg pull --- internal/rpc/msg/server.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/internal/rpc/msg/server.go b/internal/rpc/msg/server.go index b71a33345..e72f515b0 100644 --- a/internal/rpc/msg/server.go +++ b/internal/rpc/msg/server.go @@ -149,24 +149,18 @@ func (m *msgServer) PullMessageBySeqs(ctx context.Context, req *sdkws.PullMessag if err != nil { return nil, err } - resp.Msgs = append(resp.Msgs, &sdkws.PullMsgs{ - ConversationID: seq.ConversationID, - Msgs: msgs, - }) + resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{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) + notificationMsgs, 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, - }) + resp.Msgs[seq.ConversationID] = &sdkws.PullMsgs{Msgs: notificationMsgs} + } } return resp, nil