feeds-fun 1.20.3 → 1.20.5

package/package.json

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

@@ -71,10 +71,13 @@ export async function getFeeds() {
   return feeds;
 }
 
-export async function getLastEntries({period}: {period: number}) {
+export async function getLastEntries({period, minTagCount}: {period: number; minTagCount: number}) {
   const response = await post({
     url: API_GET_LAST_ENTRIES,
-    data: {period: period}
+    data: {
+      period: period,
+      minTagCount: minTagCount
+    }
   });
 
   const entries = [];
@@ -89,14 +92,16 @@ export async function getLastEntries({period}: {period: number}) {
 
 export async function getLastCollectionEntries({
   period,
-  collectionSlug
+  collectionSlug,
+  minTagCount
 }: {
   period: number;
   collectionSlug: t.CollectionSlug | null;
+  minTagCount: number;
 }) {
   const response = await post({
     url: API_GET_LAST_COLLECTION_ENTRIES,
-    data: {period: period, collectionSlug: collectionSlug}
+    data: {period: period, collectionSlug: collectionSlug, minTagCount: minTagCount}
   });
 
   const entries = [];

package/src/logic/enums.ts

@@ -5,6 +5,10 @@ export type AnyEnum = {
   [key in keyof any]: string | number;
 };
 
+///////////////////
+// Main panel modes
+///////////////////
+
 export enum MainPanelMode {
   Entries = "entries",
   Feeds = "feeds",
@@ -30,6 +34,10 @@ export const MainPanelModeProperties = new Map<MainPanelMode, MainPanelModePrope
   [MainPanelMode.Settings, {text: "Settings", showInMenu: true}]
 ]);
 
+//////////////////////
+// Last entries period
+//////////////////////
+
 export enum LastEntriesPeriod {
   Hour1 = "hour1",
   Hour3 = "hour3",
@@ -68,6 +76,10 @@ export const LastEntriesPeriodProperties = new Map<LastEntriesPeriod, LastEntrie
   [LastEntriesPeriod.AllTime, {text: "all time", seconds: c.infinity}]
 ]);
 
+////////////////
+// Entries order
+////////////////
+
 export enum EntriesOrder {
   Score = "score",
   ScoreToZero = "score-to-zero",
@@ -91,6 +103,35 @@ export const EntriesOrderProperties = new Map<EntriesOrder, EntriesOrderProperty
   [EntriesOrder.Cataloged, {text: "cataloged", orderField: "catalogedAt", timeField: "catalogedAt", direction: 1}]
 ]);
 
+////////////////
+// Min news tag count
+////////////////
+
+export enum MinNewsTagCount {
+  One = "one",
+  Two = "two",
+  Three = "three",
+  Four = "four",
+  Five = "five"
+}
+
+export type MinNewsTagCountProperty = {
+  readonly text: string;
+  readonly count: number;
+};
+
+export const MinNewsTagCountProperties = new Map<MinNewsTagCount, MinNewsTagCountProperty>([
+  [MinNewsTagCount.One, {text: "all", count: 1}],
+  [MinNewsTagCount.Two, {text: "if in 2+ news", count: 2}],
+  [MinNewsTagCount.Three, {text: "if in 3+ news", count: 3}],
+  [MinNewsTagCount.Four, {text: "if in 4+ news", count: 4}],
+  [MinNewsTagCount.Five, {text: "if in 5+ news", count: 5}]
+]);
+
+/////////
+// Marker
+/////////
+
 export enum Marker {
   Read = "read"
 }
@@ -99,6 +140,10 @@ export const reverseMarker: {[key: string]: Marker} = {
   read: Marker.Read
 };
 
+//////////////
+// Feeds order
+//////////////
+
 export enum FeedsOrder {
   Title = "title",
   Url = "url",
@@ -113,6 +158,10 @@ export const FeedsOrderProperties = new Map<FeedsOrder, {text: string; orderFiel
   [FeedsOrder.Linked, {text: "added", orderField: "linkedAt", orderDirection: "desc"}]
 ]);
 
+//////////////
+// Rules order
+//////////////
+
 export enum RulesOrder {
   Tags = "tags",
   Score = "score",

package/src/logic/types.ts

@@ -124,7 +124,7 @@ export class Entry {
   readonly feedId: FeedId;
   readonly title: string;
   readonly url: URL;
-  readonly tags: string[];
+  tags: string[];
   readonly markers: e.Marker[];
   readonly score: number;
   readonly scoreContributions: {[key: string]: number};
@@ -188,6 +188,10 @@ export class Entry {
   hasMarker(marker: e.Marker): boolean {
     return this.markers.includes(marker);
   }
+
+  hasTags(): boolean {
+    return this.tags.length > 0;
+  }
 }
 
 export function entryFromJSON(

package/src/stores/entries.ts

@@ -80,18 +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 (!updateTags) {
+          entry.tags = _.cloneDeep(existingEntry.tags);
         }
       }
       delta[entry.id] = entry;
     }
 
+    if (_.isEmpty(delta)) {
+      return;
+    }
+
     entries.value = {...entries.value, ...delta};
   }
 
@@ -104,16 +114,24 @@ export const useEntriesStore = defineStore("entriesStore", () => {
 
     const period = periodProperties.seconds;
 
+    const minTagCount = e.MinNewsTagCountProperties.get(globalSettings.minTagCount)?.count;
+
+    if (minTagCount === undefined) {
+      throw new Error(`Unknown min tag count ${globalSettings.minTagCount}`);
+    }
+
     if (mode.value === Mode.News) {
       return await api.getLastEntries({
-        period: period
+        period: period,
+        minTagCount: minTagCount
       });
     }
 
     if (mode.value === Mode.PublicCollection) {
       return await api.getLastCollectionEntries({
         period: period,
-        collectionSlug: modePublicCollectionSlug.value
+        collectionSlug: modePublicCollectionSlug.value,
+        minTagCount: minTagCount
       });
     }
 
@@ -133,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);
@@ -187,9 +208,16 @@ export const useEntriesStore = defineStore("entriesStore", () => {
       return;
     }
 
+    // We do not request tags for full entries
+    // 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});
 
-    registerEntries(loadedEntries);
+    registerEntries({
+      newEntries: loadedEntries,
+      updateTags: false
+    });
 
     requestedEntries.value = {};
   }

package/src/stores/globalSettings.ts

@@ -18,6 +18,7 @@ export const useGlobalSettingsStore = defineStore("globalSettings", () => {
   // Entries
   const lastEntriesPeriod = ref(e.LastEntriesPeriod.Day3);
   const entriesOrder = ref(e.EntriesOrder.Score);
+  const minTagCount = ref(e.MinNewsTagCount.Two);
   const showRead = ref(true);
 
   const entriesOrderProperties = computed(() => {
@@ -63,6 +64,7 @@ export const useGlobalSettingsStore = defineStore("globalSettings", () => {
     mainPanelMode,
     lastEntriesPeriod,
     entriesOrder,
+    minTagCount,
     showRead,
     entriesOrderProperties,
     dataVersion,

package/src/views/NewsView.vue

@@ -18,6 +18,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

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