@@ -65,11 +65,16 @@ func (c *Conversation) getAdvancedHistoryMessageList(ctx context.Context, req sd
6565 return nil , err
6666 }
6767 startTime = m .SendTime
68+ err = c .handleEndSeq (ctx , req , isReverse , m )
69+ if err != nil {
70+ return nil , err
71+ }
6872 } else {
6973 // Clear both maps when the user enters the conversation
7074 c .messagePullForwardEndSeqMap .Delete (conversationID , req .ViewType )
7175 c .messagePullReverseEndSeqMap .Delete (conversationID , req .ViewType )
7276 }
77+
7378 log .ZDebug (ctx , "Assembly conversation parameters" , "cost time" , time .Since (t ), "conversationID" ,
7479 conversationID , "startTime:" , startTime , "count:" , req .Count , "startTime" , startTime )
7580 list , err := c .fetchMessagesWithGapCheck (ctx , conversationID , req .Count , startTime , isReverse , req .ViewType , & messageListCallback )
@@ -84,13 +89,50 @@ func (c *Conversation) getAdvancedHistoryMessageList(ctx context.Context, req sd
8489 t = time .Now ()
8590 if ! isReverse {
8691 sort .Sort (messageList )
87-
8892 }
8993 log .ZDebug (ctx , "sort" , "sort cost time" , time .Since (t ))
9094 messageListCallback .MessageList = messageList
9195
9296 return & messageListCallback , nil
9397}
98+ func (c * Conversation ) handleEndSeq (ctx context.Context , req sdk.GetAdvancedHistoryMessageListParams , isReverse bool , startMessage * model_struct.LocalChatLog ) error {
99+ if isReverse {
100+ if _ , ok := c .messagePullReverseEndSeqMap .Load (req .ConversationID , req .ViewType ); ! ok {
101+ if startMessage .Seq != 0 {
102+ c .messagePullReverseEndSeqMap .Store (req .ConversationID , req .ViewType , startMessage .Seq )
103+ } else {
104+ validServerMessage , err := c .db .GetLatestValidServerMessage (ctx , req .ConversationID , startMessage .SendTime , isReverse )
105+ if err != nil {
106+ return err
107+ }
108+ if validServerMessage != nil {
109+ c .messagePullReverseEndSeqMap .Store (req .ConversationID , req .ViewType , validServerMessage .Seq )
110+ } else {
111+ log .ZDebug (ctx , "no valid server message" , "conversationID" , req .ConversationID , "startTime" , startMessage .SendTime )
112+ }
113+ }
114+ }
115+
116+ } else {
117+ if _ , ok := c .messagePullForwardEndSeqMap .Load (req .ConversationID , req .ViewType ); ! ok {
118+ if startMessage .Seq != 0 {
119+ c .messagePullForwardEndSeqMap .Store (req .ConversationID , req .ViewType , startMessage .Seq )
120+ } else {
121+ validServerMessage , err := c .db .GetLatestValidServerMessage (ctx , req .ConversationID , startMessage .SendTime , isReverse )
122+ if err != nil {
123+ return err
124+ }
125+ if validServerMessage != nil {
126+ c .messagePullForwardEndSeqMap .Store (req .ConversationID , req .ViewType , validServerMessage .Seq )
127+ } else {
128+ log .ZDebug (ctx , "no valid server message" , "conversationID" , req .ConversationID , "startTime" , startMessage .SendTime )
129+ }
130+ }
131+
132+ }
133+ }
134+ return nil
135+ }
94136
95137func (c * Conversation ) fetchMessagesWithGapCheck (ctx context.Context , conversationID string ,
96138 count int , startTime int64 , isReverse bool , viewType int , messageListCallback * sdk.GetAdvancedHistoryMessageListCallback ) ([]* model_struct.LocalChatLog , error ) {
@@ -127,27 +169,27 @@ func (c *Conversation) fetchMessagesWithGapCheck(ctx context.Context, conversati
127169 }
128170 if ! isReverse {
129171 if thisEndSeq != 0 {
130- c .messagePullForwardEndSeqMap .StoreWithFunc (conversationID , viewType , thisEndSeq , func (key string , value int64 ) bool {
131- lastEndSeq , _ := c .messagePullForwardEndSeqMap .Load (key , viewType )
172+ c .messagePullForwardEndSeqMap .StoreWithFunc (conversationID , viewType , thisEndSeq , func (_ string , value int64 ) bool {
173+ lastEndSeq , _ := c .messagePullForwardEndSeqMap .Load (conversationID , viewType )
132174 if value < lastEndSeq || lastEndSeq == 0 {
133175 log .ZDebug (ctx , "update the end sequence of the message" , "lastEndSeq" , lastEndSeq , "thisEndSeq" , value )
134176 return true
135177 }
136178 log .ZWarn (ctx , "The end sequence number of the message is more than the last end sequence number" ,
137- nil , "conversationID" , key , "value" , value , "lastEndSeq" , lastEndSeq )
179+ nil , "conversationID" , conversationID , "value" , value , "lastEndSeq" , lastEndSeq )
138180 return false
139181 })
140182 }
141183 } else {
142184 if thisEndSeq != 0 {
143- c .messagePullReverseEndSeqMap .StoreWithFunc (conversationID , viewType , thisEndSeq , func (key string , value int64 ) bool {
144- lastEndSeq , _ := c .messagePullReverseEndSeqMap .Load (key , viewType )
185+ c .messagePullReverseEndSeqMap .StoreWithFunc (conversationID , viewType , thisEndSeq , func (_ string , value int64 ) bool {
186+ lastEndSeq , _ := c .messagePullReverseEndSeqMap .Load (conversationID , viewType )
145187 if value > lastEndSeq || lastEndSeq == 0 {
146188 log .ZDebug (ctx , "update the end sequence of the message" , "lastEndSeq" , lastEndSeq , "thisEndSeq" , value )
147189 return true
148190 }
149191 log .ZWarn (ctx , "The end sequence number of the message is less than the last end sequence number" ,
150- nil , "conversationID" , key , "value" , value , "lastEndSeq" , lastEndSeq )
192+ nil , "conversationID" , conversationID , "value" , value , "lastEndSeq" , lastEndSeq )
151193 return false
152194 })
153195 }
0 commit comments