From cd440a77c3de333a17fb75d7ee6f633678e00477 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 19 Jul 2023 14:09:38 +0800
Subject: [PATCH] send last fetched at as a unix timestamp in ms

---
 packages/api/src/utils/createTask.ts | 2 +-
 packages/rss-handler/src/index.ts    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/utils/createTask.ts b/packages/api/src/utils/createTask.ts
index ea3745594..26ec75c41 100644
--- a/packages/api/src/utils/createTask.ts
+++ b/packages/api/src/utils/createTask.ts
@@ -573,7 +573,7 @@ export const enqueueRssFeedFetch = async (
   const payload = {
     subscriptionId: rssFeedSubscription.id,
     feedUrl: rssFeedSubscription.url,
-    lastFetchedAt: rssFeedSubscription.lastFetchedAt,
+    lastFetchedAt: rssFeedSubscription.lastFetchedAt?.getTime() || 0, // unix timestamp in milliseconds
   }
 
   const headers = {
diff --git a/packages/rss-handler/src/index.ts b/packages/rss-handler/src/index.ts
index df1d7150a..bbbd537f2 100644
--- a/packages/rss-handler/src/index.ts
+++ b/packages/rss-handler/src/index.ts
@@ -9,7 +9,7 @@ import { CONTENT_FETCH_URL, createCloudTask } from './task'
 interface RssFeedRequest {
   subscriptionId: string
   feedUrl: string
-  lastFetchedAt: string
+  lastFetchedAt: number // unix timestamp in milliseconds
 }
 
 interface ValidRssFeedItem {
@@ -180,10 +180,10 @@ export const rssHandler = Sentry.GCPFunction.wrapHttpFunction(
         // skip old items and items that were published before 24h
         const publishedAt = new Date(item.isoDate)
         if (
-          publishedAt < new Date(Date.now() - 24 * 60 * 60 * 1000) ||
-          publishedAt < new Date(lastFetchedAt)
+          publishedAt < new Date(lastFetchedAt) ||
+          publishedAt < new Date(Date.now() - 24 * 60 * 60 * 1000)
         ) {
-          console.log('Skipping old feed item', item.link)
+          console.log('Skipping old feed item', lastValidItem.link)
           continue
         }