feeds-fun 1.20.4 → 1.20.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.20.4",
+  "version": "1.20.6",
   "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

@@ -114,10 +114,10 @@ export async function getLastCollectionEntries({
   return entries;
 }
 
-export async function getEntriesByIds({ids, includeTags}: {ids: t.EntryId[]; includeTags: boolean}) {
+export async function getEntriesByIds({ids}: {ids: t.EntryId[]}) {
   const response = await post({
     url: API_GET_ENTRIES_BY_IDS,
-    data: {ids: ids, includeTags: includeTags}
+    data: {ids: ids}
   });
 
   const entries = [];

package/src/stores/entries.ts

@@ -80,21 +80,28 @@ export const useEntriesStore = defineStore("entriesStore", () => {
 
   // We bulk update entries to avoid performance degradation
   // on triggering multiple reactivity updates for each entry
-  function registerEntries(newEntries: t.Entry[]) {
+  function registerEntries({newEntries, updateTags}: {newEntries: t.Entry[]; updateTags: boolean}) {
     let delta: {[key: t.EntryId]: t.Entry} = {};
 
     for (const entry of newEntries) {
       if (entry.id in entries.value) {
-        if (entry.body === null && entries.value[entry.id].body !== null) {
-          entry.body = entries.value[entry.id].body;
+        let existingEntry = entries.value[entry.id];
+
+        if (entry.body === null && existingEntry.body !== null) {
+          entry.body = existingEntry.body;
         }
-        if (!entry.hasTags() && entries.value[entry.id].hasTags()) {
-          entry.tags = entries.value[entry.id].tags;
+
+        if (!updateTags) {
+          entry.tags = _.cloneDeep(existingEntry.tags);
         }
       }
       delta[entry.id] = entry;
     }
 
+    if (_.isEmpty(delta)) {
+      return;
+    }
+
     entries.value = {...entries.value, ...delta};
   }
 
@@ -144,7 +151,10 @@ export const useEntriesStore = defineStore("entriesStore", () => {
 
     const report = [];
 
-    registerEntries(loadedEntries);
+    registerEntries({
+      newEntries: loadedEntries,
+      updateTags: true
+    });
 
     for (const entry of loadedEntries) {
       report.push(entry.id);
@@ -202,9 +212,12 @@ export const useEntriesStore = defineStore("entriesStore", () => {
     // Because we have no approach to control which tags to exclude because of minTagCount filter
     // This method loads an additional info for a subset of entries
     // => we have no clear tag statistics on the backend
-    const loadedEntries = await api.getEntriesByIds({ids: ids, includeTags: false});
+    const loadedEntries = await api.getEntriesByIds({ids: ids});
 
-    registerEntries(loadedEntries);
+    registerEntries({
+      newEntries: loadedEntries,
+      updateTags: false
+    });
 
     requestedEntries.value = {};
   }

package/src/views/PublicCollectionView.vue

@@ -23,6 +23,13 @@
     </template>
 
     <template #side-menu-item-3>
+      Show tags
+      <config-selector
+        :values="e.MinNewsTagCountProperties"
+        v-model:property="globalSettings.minTagCount" />
+    </template>
+
+    <template #side-menu-item-4>
       Show read
 
       <config-flag