feeds-fun 1.13.2 → 1.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.13.2",
+  "version": "1.14.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/logic/api.ts

@@ -76,7 +76,7 @@ export async function getLastEntries({period}: {period: number}) {
   const entries = [];
 
   for (let rawEntry of response.entries) {
-    const entry = t.entryFromJSON(rawEntry);
+    const entry = t.entryFromJSON(rawEntry, response.tagsMapping);
     entries.push(entry);
   }
 
@@ -92,7 +92,7 @@ export async function getEntriesByIds({ids}: {ids: t.EntryId[]}) {
   const entries = [];
 
   for (let rawEntry of response.entries) {
-    const entry = t.entryFromJSON(rawEntry);
+    const entry = t.entryFromJSON(rawEntry, response.tagsMapping);
     entries.push(entry);
   }
 

package/src/logic/types.ts

@@ -184,49 +184,48 @@ export class Entry {
   }
 }
 
-export function entryFromJSON({
-  id,
-  feedId,
-  title,
-  url,
-  tags,
-  markers,
-  score,
-  scoreContributions,
-  publishedAt,
-  catalogedAt,
-  body
-}: {
-  id: string;
-  feedId: string;
-  title: string;
-  url: string;
-  tags: string[];
-  markers: string[];
-  score: number;
-  scoreContributions: {[key: string]: number};
-  publishedAt: string;
-  catalogedAt: string;
-  body: string | null;
-}): Entry {
+export function entryFromJSON(
+  rawEntry: {
+    id: string;
+    feedId: string;
+    title: string;
+    url: string;
+    tags: number[];
+    markers: string[];
+    score: number;
+    scoreContributions: {[key: number]: number};
+    publishedAt: string;
+    catalogedAt: string;
+    body: string | null;
+  },
+  tagsMapping: {[key: number]: string}
+): Entry {
+  const contributions: {[key: string]: number} = {};
+
+  for (const key in rawEntry.scoreContributions) {
+    contributions[tagsMapping[key]] = rawEntry.scoreContributions[key];
+  }
+
   return new Entry({
-    id: toEntryId(id),
-    feedId: toFeedId(feedId),
-    title,
-    url: toURL(url),
-    tags: tags,
-    markers: markers.map((m: string) => {
+    id: toEntryId(rawEntry.id),
+    feedId: toFeedId(rawEntry.feedId),
+    title: rawEntry.title,
+    url: toURL(rawEntry.url),
+    tags: rawEntry.tags.map((t: number) => tagsMapping[t]),
+    markers: rawEntry.markers.map((m: string) => {
       if (m in e.reverseMarker) {
         return e.reverseMarker[m];
       }
 
       throw new Error(`Unknown marker: ${m}`);
     }),
-    score: score,
-    scoreContributions: scoreContributions,
-    publishedAt: new Date(publishedAt),
-    catalogedAt: new Date(catalogedAt),
-    body: body
+    score: rawEntry.score,
+    // map keys from int to string
+    scoreContributions: contributions,
+    publishedAt: new Date(rawEntry.publishedAt),
+    catalogedAt: new Date(rawEntry.catalogedAt),
+
+    body: rawEntry.body
   });
 }