@bobfrankston/rmfmail 1.2.78 → 1.2.79

package/client/android-bootstrap.bundle.js

@@ -6753,7 +6753,11 @@ var GmailApiProvider = class _GmailApiProvider {
     }
     const cap = options.since ? 0 : 200;
     const ids = await this.listMessageIds(query, cap);
-    return this.batchFetch(ids, options);
+    const fresh = options.knownUids ? ids.filter((id) => !options.knownUids.has(idToUid(id))) : ids;
+    if (options.knownUids) {
+      console.log(`[gmail] fetchSince ${folder}: ${ids.length} listed, ${ids.length - fresh.length} already stored, fetching ${fresh.length}`);
+    }
+    return this.batchFetch(fresh, options);
   }
   async fetchByDate(folder, since, before, options = {}, onChunk) {
     const afterDate = this.formatDate(since);
@@ -10052,10 +10056,18 @@ var AndroidSyncManager = class {
     emitEvent({ type: "syncProgress", accountId, phase: `sync:${folder.path}`, progress: 0 });
     const highestUid = this.db.getHighestUid(accountId, folderId);
     const startDate = new Date(Date.now() - 30 * 864e5);
+    const account = this.db.getAccounts().find((a) => a.id === accountId);
+    const isGoogle = !!account && isGoogleAccount(account);
     let messages;
     if (highestUid > 0) {
-      messages = await provider.fetchSince(folder.path, highestUid, { source: false });
-      messages = messages.filter((m) => m.uid > highestUid);
+      const opts = { source: false };
+      if (isGoogle) {
+        opts.knownUids = new Set(this.db.getUidsForFolder(accountId, folderId));
+      }
+      messages = await provider.fetchSince(folder.path, highestUid, opts);
+      if (!isGoogle) {
+        messages = messages.filter((m) => m.uid > highestUid);
+      }
     } else {
       const tomorrow = new Date(Date.now() + 864e5);
       messages = await provider.fetchByDate(folder.path, startDate, tomorrow, { source: false });