tweaked how number of fetched days is counted

We look at the whole fetched dataset, before filtering out items past the scan window, to determine if we managed to fetch the whole window or not. This makes a different in situations where e.g. we want to fetch last 10 days, and someone only made one post 7 days ago; in that case, we fetch well beyond the 10-day window, but previously the returned dataset would only have that one post 7 days ago, so it would seem as if we only fetched 7 days back.

api.js

···
 
   /**
    * @param {number} days
-   * @param {{ onPageLoad?: FetchAllOnPageLoad }} [options]
+   * @param {{ onPageLoad?: FetchAllOnPageLoad, keepLastPage?: boolean }} [options]
    * @returns {Promise<json[]>}
    */
 
···
         let timestamp = x.reason ? x.reason.indexedAt : x.post.record.createdAt;
         return Date.parse(timestamp) < timeLimit;
       },
-      onPageLoad: options.onPageLoad
+      onPageLoad: options.onPageLoad,
+      keepLastPage: options.keepLastPage
     });
   }
 
···
   /**
    * @param {string} did
    * @param {number} days
-   * @param {{ onPageLoad?: FetchAllOnPageLoad, filter: AuthorFeedFilter }} options
+   * @param {{ filter: AuthorFeedFilter, onPageLoad?: FetchAllOnPageLoad, keepLastPage?: boolean }} options
    * @returns {Promise<json[]>}
    */
 
···
         let timestamp = x.reason ? x.reason.indexedAt : x.post.record.createdAt;
         return Date.parse(timestamp) < timeLimit;
       },
-      onPageLoad: options.onPageLoad
+      onPageLoad: options.onPageLoad,
+      keepLastPage: options.keepLastPage
     });
   }
 
···
   /**
    * @param {string} list
    * @param {number} days
-   * @param {{ onPageLoad?: FetchAllOnPageLoad }} [options]
+   * @param {{ onPageLoad?: FetchAllOnPageLoad, keepLastPage?: boolean }} [options]
    * @returns {Promise<json[]>}
    */
 
···
       breakWhen: (x) => {
         return Date.parse(x.post.record.createdAt) < timeLimit;
       },
-      onPageLoad: options.onPageLoad
+      onPageLoad: options.onPageLoad,
+      keepLastPage: options.keepLastPage
     });
   }
 

minisky.js

···
    *   field: string,
    *   params?: json,
    *   breakWhen?: (obj: json) => boolean,
+   *   keepLastPage?: boolean | undefined,
    *   onPageLoad?: FetchAllOnPageLoad | undefined
    * }} FetchAllOptions
    *
···
         let test = options.breakWhen;
 
         if (items.some(x => test(x))) {
-          items = items.filter(x => !test(x));
+          if (!options.keepLastPage) {
+            items = items.filter(x => !test(x));
+          }
+
           cursor = null;
         }
       }

posting_stats_page.js

···
     let scanType = this.form.elements['scan_type'].value;
 
     if (scanType == 'home') {
-      let items = await accountAPI.loadHomeTimeline(requestedDays, { onPageLoad });
+      let items = await accountAPI.loadHomeTimeline(requestedDays, {
+        onPageLoad: onPageLoad,
+        keepLastPage: true
+      });
 
       if (this.scanStartTime != startTime) {
         return;
···
     } else if (scanType == 'list') {
       let select = $(this.pageElement.querySelector('.list-choice select'), HTMLSelectElement);
       let list = select.value;
-      let items = await accountAPI.loadListTimeline(list, requestedDays, { onPageLoad });
+      let items = await accountAPI.loadListTimeline(list, requestedDays, {
+        onPageLoad: onPageLoad,
+        keepLastPage: true
+      });
 
       if (this.scanStartTime != startTime) {
         return;
···
     } else {
       let items = await accountAPI.loadUserTimeline(accountAPI.user.did, requestedDays, {
         filter: 'posts_no_replies',
-        onPageLoad: onPageLoad
+        onPageLoad: onPageLoad,
+        keepLastPage: true
       });
 
       if (this.scanStartTime != startTime) {
···
 
     let lastTimestamp = last.reason ? last.reason.indexedAt : last.post.record.createdAt;
     let lastDate = Date.parse(lastTimestamp);
-    let daysBack = (startTime - lastDate) / 86400 / 1000;
+    let fetchedDays = (startTime - lastDate) / 86400 / 1000;
+
+    if (Math.ceil(fetchedDays) < requestedDays) {
+      let scanInfo = $(this.pageElement.querySelector('.scan-info'));
+      scanInfo.innerText = `🕓 Showing data from ${Math.round(fetchedDays)} days (the timeline only goes that far):`;
+      scanInfo.style.display = 'block';
+    }
+
+    items = items.filter(x => {
+      let timestamp = x.reason ? x.reason.indexedAt : x.post.record.createdAt;
+      return Date.parse(timestamp) > startTime - requestedDays * 86400 * 1000;
+    });
+
+    let daysBack = Math.min(requestedDays, fetchedDays);
 
     for (let item of items) {
       if (item.reply) { continue; }
···
       }
 
       tbody.append(tr);
-    }
-
-    if (Math.ceil(daysBack) < requestedDays) {
-      let scanInfo = $(this.pageElement.querySelector('.scan-info'));
-      scanInfo.innerText = `🕓 Showing data from ${Math.round(daysBack)} days (your timeline only goes that far):`;
-      scanInfo.style.display = 'block';
     }
 
     this.table.style.display = 'table';