fix: fetch message return isEnd and endSeq panic. (#2959)

FGadvancer · web-flow · commit 1eaae5f9804b · 2024-12-12T10:13:35.000Z
* fix: server can return isEnd to control fetch messages when sdk pull messages end normally.

* fix: server can return isEnd to control fetch messages when sdk pull messages end normally.

* fix: server can return isEnd to control fetch messages when sdk pull messages end normally.
diff --git a/internal/rpc/msg/sync_msg.go b/internal/rpc/msg/sync_msg.go
@@ -97,8 +97,6 @@ func (m *msgServer) GetSeqMessage(ctx context.Context, req *msg.GetSeqMessageReq
 			return nil, err
 		}
 		var pullMsgs *sdkws.PullMsgs
-		pullMsgs.IsEnd = isEnd
-		pullMsgs.EndSeq = endSeq
 		if ok := false; conversationutil.IsNotificationConversationID(conv.ConversationID) {
 			pullMsgs, ok = resp.NotificationMsgs[conv.ConversationID]
 			if !ok {
@@ -113,6 +111,8 @@ func (m *msgServer) GetSeqMessage(ctx context.Context, req *msg.GetSeqMessageReq
 			}
 		}
 		pullMsgs.Msgs = append(pullMsgs.Msgs, msgs...)
+		pullMsgs.IsEnd = isEnd
+		pullMsgs.EndSeq = endSeq
 	}
 	return resp, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,6 @@ func (m msgServer) GetSeqMessage(ctx context.Context, req msg.GetSeqMessageReq`
`97`	`97`	`return nil, err`
`98`	`98`	`}`
`99`	`99`	`var pullMsgs *sdkws.PullMsgs`
`100`		`- pullMsgs.IsEnd = isEnd`
`101`		`- pullMsgs.EndSeq = endSeq`
`102`	`100`	`if ok := false; conversationutil.IsNotificationConversationID(conv.ConversationID) {`
`103`	`101`	`pullMsgs, ok = resp.NotificationMsgs[conv.ConversationID]`
`104`	`102`	`if !ok {`
`@@ -113,6 +111,8 @@ func (m msgServer) GetSeqMessage(ctx context.Context, req msg.GetSeqMessageReq`
`113`	`111`	`}`
`114`	`112`	`}`
`115`	`113`	`pullMsgs.Msgs = append(pullMsgs.Msgs, msgs...)`
	`114`	`+ pullMsgs.IsEnd = isEnd`
	`115`	`+ pullMsgs.EndSeq = endSeq`
`116`	`116`	`}`
`117`	`117`	`return resp, nil`
`118`	`118`	`}`