_

protocol/messenger_mailserver.go

@@ -212,6 +212,22 @@ func (m *Messenger) capToDefaultSyncPeriod(period uint32) (uint32, error) {
 	return period - tolerance, nil
 }
 
+func (m *Messenger) updateFiltersPriority(filters []*transport.Filter) {
+	for _, filter := range filters {
+		chatID := filter.ChatID
+		chat := m.Chat(chatID)
+		if chat != nil {
+			filter.Priority = chat.ReadMessagesAtClockValue
+		}
+	}
+}
+
+func (m *Messenger) resetFiltersPriority(filters []*transport.Filter) {
+	for _, filter := range filters {
+		filter.Priority = 0
+	}
+}
+
 // RequestAllHistoricMessages requests all the historic messages for any topic
 func (m *Messenger) RequestAllHistoricMessages() (*MessengerResponse, error) {
 	shouldSync, err := m.shouldSync()
@@ -237,7 +253,14 @@ func (m *Messenger) RequestAllHistoricMessages() (*MessengerResponse, error) {
 		m.logger.Info("backup fetched")
 	}
 
-	return m.syncFilters(m.transport.Filters())
+	filters := m.transport.Filters()
+	m.updateFiltersPriority(filters)
+	defer m.resetFiltersPriority(filters)
+	return m.syncFilters(filters)
+}
+
+func getPrioritizedBatches() []int {
+	return []int{1, 5, 10}
 }
 
 func (m *Messenger) syncFilters(filters []*transport.Filter) (*MessengerResponse, error) {
@@ -262,14 +285,11 @@ func (m *Messenger) syncFilters(filters []*transport.Filter) (*MessengerResponse
 		p2 := filters[j].Priority
 		return p1 > p2
 	})
+	prioritizedBatches := getPrioritizedBatches()
+	currentBatch := 0
 
-	firstBatchCap := 1
-	secondBatchCap := 5
-	thirdBatchCap := 10
 	if filters[0].Priority == 0 {
-		firstBatchCap = 0
-		secondBatchCap = 0
-		thirdBatchCap = 0
+		currentBatch = len(prioritizedBatches)
 	}
 
 	defaultPeriodFromNow, err := m.defaultSyncPeriodFromNow()
@@ -299,35 +319,25 @@ func (m *Messenger) syncFilters(filters []*transport.Filter) (*MessengerResponse
 		}
 
 		batchID := topicData.LastRequest
-		if firstBatchCap > 0 {
-			batchID = 0
-			firstBatchCap--
-		} else if secondBatchCap > 0 {
-			batch, ok := batches[1]
+
+		if currentBatch < len(prioritizedBatches) {
+			batch, ok := batches[currentBatch]
 			if ok {
 				prevTopicData, ok := topicsData[batch.Topics[0].String()]
 				if (!ok && topicData.LastRequest != int(defaultPeriodFromNow)) ||
 					(ok && prevTopicData.LastRequest != topicData.LastRequest) {
-					secondBatchCap = 0
+					currentBatch++
 				}
 			}
-			if secondBatchCap > 0 {
-				batchID = 1
-				secondBatchCap--
-			}
-		} else if thirdBatchCap > 0 {
-			batch, ok := batches[2]
-			if ok {
-				prevTopicData, ok := topicsData[batch.Topics[0].String()]
-				if (!ok && topicData.LastRequest != int(defaultPeriodFromNow)) ||
-					prevTopicData.LastRequest != topicData.LastRequest {
-					thirdBatchCap = 0
+			if currentBatch < len(prioritizedBatches) {
+				batchID = currentBatch
+				currentBatchCap := prioritizedBatches[currentBatch] - 1
+				if currentBatchCap == 0 {
+					currentBatch++
+				} else {
+					prioritizedBatches[currentBatch] = currentBatchCap
 				}
 			}
-			if thirdBatchCap > 0 {
-				batchID = 2
-				thirdBatchCap--
-			}
 		}
 
 		batch, ok := batches[batchID]
@@ -365,7 +375,6 @@ func (m *Messenger) syncFilters(filters []*transport.Filter) (*MessengerResponse
 	i := 0
 	for _, k := range batchKeys {
 		batch := batches[k]
-		m.logger.Info("BAAAATCH", zap.Any("BATCHID", k))
 		i++
 		err := m.processMailserverBatch(batch)
 		if err != nil {