feeds-fun 1.23.1 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.23.1",
+  "version": "1.24.0",
   "author": "Aliaksei Yaletski (Tiendil) <a.eletsky@gmail.com> (https://tiendil.org/)",
   "description": "Frontend for the Feeds Fun — web-based news reader",
   "keywords": [

package/src/components/EntryForList.vue

@@ -125,10 +125,6 @@
       return "How long ago the news was published";
     }
 
-    if (properties.timeField === "catalogedAt") {
-      return "How long ago the news was collected";
-    }
-
     return "";
   });
 

package/src/components/notifications/LoadedOldNews.vue

@@ -41,6 +41,11 @@
 
     return properties.entries.every((entryId) => {
       const entry = entriesStore.entries[entryId];
+      if (entry.publishedAt === null) {
+        // we do not expect publishedAt to be null here
+        // but just in case we treat such entries as old ones
+        return true;
+      }
       return entry.publishedAt.getTime() < Date.now() - properties.period.seconds * 1000;
     });
   });

package/src/logic/enums.ts

@@ -99,8 +99,7 @@ export enum EntriesOrder {
   Score = "score",
   ScoreToZero = "score-to-zero",
   ScoreBackward = "score-backward",
-  Published = "published",
-  Cataloged = "cataloged"
+  Published = "published"
 }
 
 export type EntriesOrderProperty = {
@@ -112,11 +111,10 @@ export type EntriesOrderProperty = {
 };
 
 export const EntriesOrderProperties = new Map<EntriesOrder, EntriesOrderProperty>([
-  [EntriesOrder.Score, {text: "score", orderField: "score", timeField: "catalogedAt", direction: 1, default: true}],
-  [EntriesOrder.ScoreToZero, {text: "score ~ 0", orderField: "scoreToZero", timeField: "catalogedAt", direction: 1}],
-  [EntriesOrder.ScoreBackward, {text: "score backward", orderField: "score", timeField: "catalogedAt", direction: -1}],
-  [EntriesOrder.Published, {text: "published", orderField: "publishedAt", timeField: "publishedAt", direction: 1}],
-  [EntriesOrder.Cataloged, {text: "cataloged", orderField: "catalogedAt", timeField: "catalogedAt", direction: 1}]
+  [EntriesOrder.Score, {text: "score", orderField: "score", timeField: "publishedAt", direction: 1, default: true}],
+  [EntriesOrder.ScoreToZero, {text: "score ~ 0", orderField: "scoreToZero", timeField: "publishedAt", direction: 1}],
+  [EntriesOrder.ScoreBackward, {text: "score backward", orderField: "score", timeField: "publishedAt", direction: -1}],
+  [EntriesOrder.Published, {text: "published", orderField: "publishedAt", timeField: "publishedAt", direction: 1}]
 ]);
 
 /////////////////////

package/src/logic/types.ts

@@ -129,8 +129,7 @@ export class Entry {
   readonly score: number;
   readonly scoreContributions: {[key: string]: number};
   readonly scoreToZero: number;
-  readonly publishedAt: Date;
-  readonly catalogedAt: Date;
+  publishedAt: Date | null;
   body: string | null;
 
   constructor({
@@ -143,7 +142,6 @@ export class Entry {
     score,
     scoreContributions,
     publishedAt,
-    catalogedAt,
     body
   }: {
     id: EntryId;
@@ -154,8 +152,7 @@ export class Entry {
     markers: e.Marker[];
     score: number;
     scoreContributions: {[key: string]: number};
-    publishedAt: Date;
-    catalogedAt: Date;
+    publishedAt: Date | null;
     body: string | null;
   }) {
     this.id = id;
@@ -167,7 +164,6 @@ export class Entry {
     this.score = score;
     this.scoreContributions = scoreContributions;
     this.publishedAt = publishedAt;
-    this.catalogedAt = catalogedAt;
     this.body = body;
 
     this.scoreToZero = -Math.abs(score);
@@ -204,8 +200,7 @@ export function entryFromJSON(
     markers: string[];
     score: number;
     scoreContributions: {[key: number]: number};
-    publishedAt: string;
-    catalogedAt: string;
+    publishedAt: string | null;
     body: string | null;
   },
   tagsMapping: {[key: number]: string}
@@ -232,8 +227,7 @@ export function entryFromJSON(
     score: rawEntry.score,
     // map keys from int to string
     scoreContributions: contributions,
-    publishedAt: new Date(rawEntry.publishedAt),
-    catalogedAt: new Date(rawEntry.catalogedAt),
+    publishedAt: rawEntry.publishedAt !== null ? new Date(rawEntry.publishedAt) : null,
 
     body: rawEntry.body
   });

package/src/stores/entries.ts

@@ -96,6 +96,10 @@ export const useEntriesStore = defineStore("entriesStore", () => {
           entry.body = existingEntry.body;
         }
 
+        if (entry.publishedAt === null && existingEntry.publishedAt !== null) {
+          entry.publishedAt = existingEntry.publishedAt;
+        }
+
         if (!updateTags) {
           entry.tags = _.cloneDeep(existingEntry.tags);
         }