Revert "fix(history-sync): ignore non-primary completions"

This reverts commit c0523d6.

Author: alexandrereyes

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

@@ -1017,18 +1017,15 @@ export class BaileysStartupService extends ChannelStartupService {
       syncType?: proto.HistorySync.HistorySyncType;
     }) => {
       try {
-        const shouldTrackHistorySync = progress !== undefined && this.isSyncNotificationFromUsedSyncType(syncType);
         const normalizedProgress = progress ?? -1;
 
-        if (shouldTrackHistorySync && normalizedProgress <= this.historySyncLastProgress) {
+        if (normalizedProgress <= this.historySyncLastProgress) {
           this.historySyncMessageCount = 0;
           this.historySyncChatCount = 0;
           this.historySyncContactCount = 0;
         }
 
-        if (shouldTrackHistorySync) {
-          this.historySyncLastProgress = normalizedProgress;
-        }
+        this.historySyncLastProgress = normalizedProgress;
 
         if (syncType === proto.HistorySync.HistorySyncType.ON_DEMAND) {
           console.log('received on-demand history sync, messages=', messages);
@@ -1124,9 +1121,7 @@ export class BaileysStartupService extends ChannelStartupService {
           await this.prismaRepository.chat.createMany({ data: chatsToCreateMany, skipDuplicates: true });
         }
 
-        if (shouldTrackHistorySync) {
-          this.historySyncChatCount += chatsRaw.length;
-        }
+        this.historySyncChatCount += chatsRaw.length;
 
         this.sendDataWebhook(Events.CHATS_SET, chatsRaw);
 
@@ -1181,9 +1176,7 @@ export class BaileysStartupService extends ChannelStartupService {
           messagesRaw.push(this.prepareMessage(m));
         }
 
-        if (shouldTrackHistorySync) {
-          this.historySyncMessageCount += messagesRaw.length;
-        }
+        this.historySyncMessageCount += messagesRaw.length;
 
         if (this.configService.get<Database>('DATABASE').SAVE_DATA.HISTORIC) {
           await this.prismaRepository.message.createMany({ data: messagesRaw, skipDuplicates: true });
@@ -1207,17 +1200,14 @@ export class BaileysStartupService extends ChannelStartupService {
         }
 
         const filteredContacts = contacts.filter((c) => !!c.notify || !!c.name);
-        if (shouldTrackHistorySync) {
-          this.historySyncContactCount += filteredContacts.length;
-        }
+        this.historySyncContactCount += filteredContacts.length;
 
-        if (shouldTrackHistorySync && normalizedProgress === 100) {
+        if (normalizedProgress === 100) {
           this.sendDataWebhook(Events.MESSAGING_HISTORY_SET, {
             messageCount: this.historySyncMessageCount,
             chatCount: this.historySyncChatCount,
             contactCount: this.historySyncContactCount,
             progress: normalizedProgress,
-            syncType,
           });
 
           this.historySyncMessageCount = 0;
@@ -2224,7 +2214,7 @@ export class BaileysStartupService extends ChannelStartupService {
       this.configService.get<Chatwoot>('CHATWOOT').ENABLED &&
       this.localChatwoot?.enabled &&
       this.localChatwoot.importMessages &&
-      this.isSyncNotificationFromUsedSyncType(msg?.syncType)
+      this.isSyncNotificationFromUsedSyncType(msg)
     ) {
       if (msg.chunkOrder === 1) {
         this.chatwootService.startImportHistoryMessages(instance);
@@ -2240,12 +2230,10 @@ export class BaileysStartupService extends ChannelStartupService {
     return true;
   }
 
-  private isSyncNotificationFromUsedSyncType(
-    syncType?: proto.HistorySync.HistorySyncType | proto.Message.HistorySyncType,
-  ) {
+  private isSyncNotificationFromUsedSyncType(msg: proto.Message.IHistorySyncNotification) {
     return (
-      (this.localSettings.syncFullHistory && syncType === proto.HistorySync.HistorySyncType.FULL) ||
-      (!this.localSettings.syncFullHistory && syncType === proto.HistorySync.HistorySyncType.RECENT)
+      (this.localSettings.syncFullHistory && msg?.syncType === 2) ||
+      (!this.localSettings.syncFullHistory && msg?.syncType === 3)
     );
   }