feeds-fun 1.16.4 → 1.16.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.16.4",
+  "version": "1.16.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/components/FfunTag.vue

@@ -34,6 +34,7 @@
   import {useTagsStore} from "@/stores/tags";
   import * as tagsFilterState from "@/logic/tagsFilterState";
   import * as asserts from "@/logic/asserts";
+  import * as events from "@/logic/events";
 
   const tagsStore = useTagsStore();
 
@@ -47,6 +48,7 @@
     countMode?: string | null;
     secondaryMode?: string | null;
     showSwitch?: boolean | null;
+    changeSource: events.TagChangeSource;
   }>();
 
   const tagInfo = computed(() => {
@@ -81,14 +83,20 @@
     return result;
   });
 
-  function onClick() {
+  async function onClick() {
     asserts.defined(tagsStates);
-    tagsStates.value.onTagClicked({tag: properties.uid});
+
+    let changeInfo = tagsStates.value.onTagClicked({tag: properties.uid});
+
+    await events.tagStateChanged({tag: properties.uid, source: properties.changeSource, ...changeInfo});
   }
 
-  function onRevers() {
+  async function onRevers() {
     asserts.defined(tagsStates);
-    tagsStates.value.onTagReversed({tag: properties.uid});
+
+    let changeInfo = tagsStates.value.onTagReversed({tag: properties.uid});
+
+    await events.tagStateChanged({tag: properties.uid, source: properties.changeSource, ...changeInfo});
   }
 
   const tooltip = computed(() => {

package/src/components/TagsFilter.vue

@@ -11,8 +11,9 @@
           class="ml-1"
           :uid="tag"
           :count="tags[tag] ?? 0"
-          :showSwitch="true"
-          count-mode="no" />
+          :show-switch="true"
+          count-mode="no"
+          change-source="tag_filter" />
       </li>
     </ul>
 
@@ -34,7 +35,8 @@
         <ffun-tag
           :uid="tag"
           :count="tags[tag]"
-          count-mode="prefix" />
+          count-mode="prefix"
+          changeSource="tag_filter" />
       </li>
     </ul>
 

package/src/components/TagsList.vue

@@ -7,7 +7,8 @@
         :uid="tag"
         :count="tagsCount[tag]"
         :secondary-mode="tagMode(tag)"
-        count-mode="tooltip" />
+        count-mode="tooltip"
+        change-source="entry_record" />
 
       <a
         class=""

package/src/logic/events.ts

@@ -1,5 +1,8 @@
 import * as api from "@/logic/api";
 import type * as t from "@/logic/types";
+import type {State as TagState} from "@/logic/tagsFilterState";
+
+export type TagChangeSource = "tag_filter" | "entry_record";
 
 export async function newsLinkOpened({entryId}: {entryId: t.EntryId}) {
   await api.trackEvent({name: "news_link_opened", entry_id: entryId});
@@ -12,3 +15,23 @@ export async function newsBodyOpened({entryId}: {entryId: t.EntryId}) {
 export async function socialLinkClicked({linkType}: {linkType: string}) {
   await api.trackEvent({name: "social_link_clicked", link_type: linkType});
 }
+
+export async function tagStateChanged({
+  tag,
+  fromState,
+  toState,
+  source
+}: {
+  tag: string;
+  fromState: TagState;
+  toState: TagState;
+  source: TagChangeSource;
+}) {
+  await api.trackEvent({
+    name: "tag_filter_state_changed",
+    tag: tag,
+    from_state: fromState,
+    to_state: toState,
+    source: source
+  });
+}

package/src/logic/tagsFilterState.ts

@@ -26,25 +26,33 @@ export class Storage {
     });
   }
 
-  onTagStateChanged({tag, state}: {tag: string; state: State}) {
+  onTagStateChanged({tag, state}: {tag: string; state: State}): {fromState: State; toState: State} {
     if (state === "required") {
       this.requiredTags[tag] = true;
       if (this.excludedTags[tag]) {
         delete this.excludedTags[tag];
+        return {fromState: "excluded", toState: "required"};
       }
+      return {fromState: "none", toState: "required"};
     } else if (state === "excluded") {
       this.excludedTags[tag] = true;
       if (this.requiredTags[tag]) {
         delete this.requiredTags[tag];
+        return {fromState: "required", toState: "excluded"};
       }
+      return {fromState: "none", toState: "excluded"};
     } else if (state === "none") {
       if (this.requiredTags[tag]) {
         delete this.requiredTags[tag];
+        return {fromState: "required", toState: "none"};
       }
 
       if (this.excludedTags[tag]) {
         delete this.excludedTags[tag];
+        return {fromState: "excluded", toState: "none"};
       }
+
+      return {fromState: "none", toState: "none"};
     } else {
       throw new Error(`Unknown tag state: ${state}`);
     }
@@ -52,11 +60,11 @@ export class Storage {
 
   onTagReversed({tag}: {tag: string}) {
     if (!(tag in this.selectedTags)) {
-      this.onTagStateChanged({tag: tag, state: "required"});
+      return this.onTagStateChanged({tag: tag, state: "required"});
     } else if (this.requiredTags[tag]) {
-      this.onTagStateChanged({tag: tag, state: "excluded"});
+      return this.onTagStateChanged({tag: tag, state: "excluded"});
     } else if (this.excludedTags[tag]) {
-      this.onTagStateChanged({tag: tag, state: "required"});
+      return this.onTagStateChanged({tag: tag, state: "required"});
     } else {
       throw new Error(`Unknown tag state: ${tag}`);
     }
@@ -64,9 +72,9 @@ export class Storage {
 
   onTagClicked({tag}: {tag: string}) {
     if (tag in this.selectedTags) {
-      this.onTagStateChanged({tag: tag, state: "none"});
+      return this.onTagStateChanged({tag: tag, state: "none"});
     } else {
-      this.onTagStateChanged({tag: tag, state: "required"});
+      return this.onTagStateChanged({tag: tag, state: "required"});
     }
   }