From 7bb63b4ecd99ff12014122c81057b23aefa0615c Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 24 Jan 2024 15:32:43 +0800
Subject: [PATCH] for campability with old clients, use refreshedAt to replace
 lastFetchedAt

---
 packages/api/src/jobs/rss/refreshFeed.ts         | 5 ++---
 packages/api/src/resolvers/function_resolvers.ts | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/jobs/rss/refreshFeed.ts b/packages/api/src/jobs/rss/refreshFeed.ts
index 9a18bcce9..ad09fa909 100644
--- a/packages/api/src/jobs/rss/refreshFeed.ts
+++ b/packages/api/src/jobs/rss/refreshFeed.ts
@@ -2,7 +2,6 @@ import axios from 'axios'
 import crypto from 'crypto'
 import { parseHTML } from 'linkedom'
 import Parser, { Item } from 'rss-parser'
-import { SubscriptionStatus } from '../../entity/subscription'
 import { env } from '../../env'
 import { redisDataSource } from '../../redis_data_source'
 import { validateUrl } from '../../services/create_page_save_request'
@@ -537,13 +536,13 @@ const processSubscription = async (
 
       itemCount = itemCount + 1
     } catch (error) {
-      console.error('Error while saving RSS feed item', error, item)
+      console.error('Error while saving RSS feed item', { error, item })
       failedAt = new Date()
     }
   }
 
   // no items saved
-  if (!lastItemFetchedAt) {
+  if (!lastItemFetchedAt && !failedAt) {
     // the feed has been fetched before, no new valid items found
     if (mostRecentItemDate || !lastValidItem) {
       console.log('No new valid items found')
diff --git a/packages/api/src/resolvers/function_resolvers.ts b/packages/api/src/resolvers/function_resolvers.ts
index 6142a725d..ad3e3ac96 100644
--- a/packages/api/src/resolvers/function_resolvers.ts
+++ b/packages/api/src/resolvers/function_resolvers.ts
@@ -479,7 +479,7 @@ export const functionResolvers = {
     },
     // for campability with old clients
     lastFetchedAt(subscription: Subscription) {
-      return subscription.mostRecentItemDate
+      return subscription.refreshedAt
     },
   },
   NewsletterEmail: {