fix timestamp error

osmoscraft · Jan 13, 2022 · 396d755 · 396d755
1 parent 879cc4f
commit 396d755
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/packages/feed-builder/src/plugins/lib/__tests__/merge.test.ts b/packages/feed-builder/src/plugins/lib/__tests__/merge.test.ts
@@ -23,28 +23,6 @@ describe("Util/Merge", () => {
   });
 
   it("Feed/Metadata update", async () => {
-    const existing: JsonFeed = {
-      version: "Mock version",
-      title: "Mock title",
-      description: "Mock description",
-      items: [],
-    };
-
-    const incoming: JsonFeed = {
-      version: "Mock version",
-      title: "Mock title new",
-      description: "Mock description new",
-      items: [],
-    };
-
-    const merged = mergeJsonFeed(incoming, existing);
-
-    await expect(merged.items.length).toEqual(0);
-    await expect(merged.title).toEqual("Mock title new");
-    await expect(merged.description).toEqual("Mock description new");
-  });
-
-  it("Feed/Metadata update/Persist publish time", async () => {
     const existing: JsonFeed = {
       version: "Mock version",
       title: "Mock title",
@@ -70,7 +48,7 @@ describe("Util/Merge", () => {
     await expect(merged.items.length).toEqual(0);
     await expect(merged.title).toEqual("Mock title new");
     await expect(merged.description).toEqual("Mock description new");
-    await expect(merged._ext.date_published).toEqual("2000-01-01T00:00:00Z");
+    await expect(merged._ext.date_published).toEqual("2000-01-02T00:00:00Z");
   });
 
   it("Items/Addition", async () => {

diff --git a/packages/feed-builder/src/plugins/lib/merge.ts b/packages/feed-builder/src/plugins/lib/merge.ts
@@ -4,11 +4,6 @@ export function mergeJsonFeed<T extends JsonFeed>(newFeed: T, existingFeed: T):
   return {
     ...existingFeed,
     ...newFeed,
-    _ext: {
-      ...existingFeed._ext,
-      ...newFeed._ext,
-      date_published: existingFeed._ext?.date_published ?? newFeed._ext?.date_published, // publish timestamp is considered immutable
-    },
     items: mergeFeedItems(newFeed.items, existingFeed.items, mergeItems).sort(sortItems),
   };
 }

diff --git a/packages/feed-builder/src/plugins/synthetic-publish-time.ts b/packages/feed-builder/src/plugins/synthetic-publish-time.ts
@@ -33,10 +33,10 @@ export function useSyntheticPublishTime(): Plugin {
           _ext: {
             ...feed._ext,
             date_published:
-              (feed as ParsedJsonFeed)._ext?.date_published ??
-              (feed as ParsedJsonFeed)._ext?.date_modified ??
               feed.items[0]?.date_published ??
               feed.items[0]?.date_modified ??
+              (feed as ParsedJsonFeed)._ext?.date_published ??
+              (feed as ParsedJsonFeed)._ext?.date_modified ??
               new Date().toISOString(),
           },
         })),