feeds-fun 1.13.1 → 1.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "author": "Aliaksei Yaletski (Tiendil) <a.eletsky@gmail.com> (https://tiendil.org/)",
   "description": "Frontend for the Feeds Fun — web-based news reader",
   "keywords": [
@@ -33,38 +33,39 @@
   },
   "dependencies": {
     "@chenfengyuan/vue-countdown": "^2.1.2",
-    "@vueuse/core": "^9.13.0",
-    "axios": "^1.5.1",
-    "dompurify": "^3.0.6",
-    "pinia": "^2.1.7",
+    "@vueuse/core": "^11.2.0",
+    "axios": "^1.7.7",
+    "dompurify": "^3.1.7",
+    "pinia": "^2.2.6",
     "set-interval-async": "^3.0.3",
     "supertokens-web-js": "^0.5.0",
-    "vue": "^3.2.47",
-    "vue-router": "^4.2.5"
+    "vue": "^3.5.12",
+    "vue-router": "^4.4.5",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.5.1",
-    "@tailwindcss/typography": "^0.5.10",
-    "@types/dompurify": "^3.0.3",
-    "@types/jsdom": "^21.1.3",
-    "@types/lodash": "^4.14.199",
-    "@types/node": "^18.18.5",
-    "@vitejs/plugin-vue": "^4.4.0",
-    "@vue/eslint-config-prettier": "^7.1.0",
-    "@vue/eslint-config-typescript": "^11.0.3",
-    "@vue/test-utils": "^2.4.1",
-    "@vue/tsconfig": "^0.1.3",
-    "autoprefixer": "^10.4.16",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "jsdom": "^21.1.2",
+    "@rushstack/eslint-patch": "^1.10.4",
+    "@tailwindcss/typography": "^0.5.15",
+    "@types/dompurify": "^3.0.5",
+    "@types/jsdom": "^21.1.7",
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^22.9.0",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@vue/eslint-config-prettier": "^10.1.0",
+    "@vue/eslint-config-typescript": "^14.1.3",
+    "@vue/test-utils": "^2.4.6",
+    "@vue/tsconfig": "^0.5.1",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^9.14.0",
+    "eslint-plugin-vue": "^9.30.0",
+    "jsdom": "^25.0.1",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.31",
-    "prettier": "^2.8.8",
-    "tailwindcss": "^3.3.3",
-    "typescript": "~4.8.4",
-    "vite": "^4.4.11",
-    "vitest": "^0.29.8",
-    "vue-tsc": "^1.8.19"
+    "postcss": "^8.4.47",
+    "prettier": "^3.3.3",
+    "tailwindcss": "^3.4.14",
+    "typescript": "~5.6.3",
+    "vite": "^5.4.10",
+    "vitest": "^2.1.4",
+    "vue-tsc": "^2.1.10"
   }
 }

package/src/components/EntryForList.vue

@@ -55,6 +55,7 @@
         ><a
           :href="entry.url"
           target="_blank"
+          @click="newsLinkOpenedEvent"
           >{{ purifiedTitle }}</a
         ></h2
       >
@@ -71,6 +72,7 @@
   import _ from "lodash";
   import {computed, ref} from "vue";
   import type * as t from "@/logic/types";
+  import * as events from "@/logic/events";
   import * as e from "@/logic/enums";
   import {computedAsync} from "@vueuse/core";
   import DOMPurify from "dompurify";
@@ -109,7 +111,7 @@
     return _.get(entry.value, properties.timeField, null);
   });
 
-  function displayBody() {
+  async function displayBody() {
     showBody.value = true;
 
     emit("entry:bodyVisibilityChanged", {entryId: properties.entryId, visible: true});
@@ -119,6 +121,8 @@
     }
 
     entriesStore.requestFullEntry({entryId: entry.value.id});
+
+    await events.newsBodyOpened({entryId: entry.value.id});
   }
 
   function hideBody() {
@@ -152,6 +156,10 @@
     return DOMPurify.sanitize(entry.value.body);
   });
 
+  async function newsLinkOpenedEvent() {
+    await events.newsLinkOpened({entryId: entry.value.id});
+  }
+
   async function onTitleClick(event: MouseEvent) {
     if (!event.ctrlKey) {
       event.preventDefault();
@@ -162,6 +170,8 @@
       } else {
         displayBody();
       }
+    } else {
+      await newsLinkOpenedEvent();
     }
 
     // TODO: is it will be too slow?

package/src/layouts/SidePanelLayout.vue

@@ -72,6 +72,7 @@
                 target="_blank"
                 class="ffun-header-link"
                 style="text-decoration: none"
+                @click="events.socialLinkClicked({linkType: 'api'})"
                 >API</a
               >
             </li>
@@ -82,6 +83,7 @@
                 target="_blank"
                 class="ffun-header-link"
                 style="text-decoration: none"
+                @click="events.socialLinkClicked({linkType: 'blog'})"
                 >Blog</a
               >
             </li>
@@ -93,6 +95,7 @@
                 class="ffun-header-link text-xl align-middle"
                 title="Reddit"
                 style="text-decoration: none"
+                @click="events.socialLinkClicked({linkType: 'reddit'})"
                 ><i class="ti ti-brand-reddit"></i
               ></a>
             </li>
@@ -104,6 +107,7 @@
                 class="ffun-header-link text-xl align-middle"
                 title="Discord"
                 style="text-decoration: none"
+                @click="events.socialLinkClicked({linkType: 'discord'})"
                 ><i class="ti ti-brand-discord"></i
               ></a>
             </li>
@@ -114,7 +118,8 @@
                 target="_blank"
                 class="ffun-header-link text-xl align-middle"
                 title="GitHub"
-                style="text-decoration: none">
+                style="text-decoration: none"
+                @click="events.socialLinkClicked({linkType: 'github'})">
                 <i class="ti ti-brand-github"></i
               ></a>
             </li>
@@ -150,6 +155,7 @@
   import {useGlobalSettingsStore} from "@/stores/globalSettings";
   import {useGlobalState} from "@/stores/globalState";
   import {useSupertokens} from "@/stores/supertokens";
+  import * as events from "@/logic/events";
   import * as e from "@/logic/enums";
   import * as settings from "@/logic/settings";
 

package/src/logic/api.ts

@@ -28,6 +28,7 @@ const API_GET_USER_SETTINGS = `${ENTRY_POINT}/get-user-settings`;
 const API_SET_USER_SETTING = `${ENTRY_POINT}/set-user-setting`;
 const API_GET_RESOURCE_HISTORY = `${ENTRY_POINT}/get-resource-history`;
 const API_GET_INFO = `${ENTRY_POINT}/get-info`;
+const API_TRACK_EVENT = `${ENTRY_POINT}/track-event`;
 
 let _onSessionLost: () => void = () => {};
 
@@ -176,7 +177,9 @@ export async function discoverFeeds({url}: {url: string}) {
 }
 
 export async function addFeed({url}: {url: string}) {
-  await post({url: API_ADD_FEED, data: {url: url}});
+  const response = await post({url: API_ADD_FEED, data: {url: url}});
+
+  return t.feedFromJSON(response.feed);
 }
 
 export async function addOPML({content}: {content: string}) {
@@ -275,3 +278,7 @@ export async function getInfo() {
 
   return response;
 }
+
+export async function trackEvent(data: {[key: string]: string | number | null}) {
+  await post({url: API_TRACK_EVENT, data: {event: data}});
+}

package/src/logic/events.ts

@@ -0,0 +1,14 @@
+import * as api from "@/logic/api";
+import type * as t from "@/logic/types";
+
+export async function newsLinkOpened({entryId}: {entryId: t.EntryId}) {
+  await api.trackEvent({name: "news_link_opened", entry_id: entryId});
+}
+
+export async function newsBodyOpened({entryId}: {entryId: t.EntryId}) {
+  await api.trackEvent({name: "news_body_opened", entry_id: entryId});
+}
+
+export async function socialLinkClicked({linkType}: {linkType: string}) {
+  await api.trackEvent({name: "social_link_clicked", link_type: linkType});
+}

package/src/stores/feeds.ts

@@ -1,4 +1,4 @@
-import {computed, ref, watch} from "vue";
+import {computed, ref, watch, triggerRef} from "vue";
 import {useRouter} from "vue-router";
 import {defineStore} from "pinia";
 
@@ -30,19 +30,25 @@ export const useFeedsStore = defineStore("feedsStore", () => {
   async function unsubscribe(feedId: t.FeedId) {
     await api.unsubscribe({feedId: feedId});
 
-    // Attention, do not call globalSettings.updateDataVersion
+    // Attention, do not update globalSettings.updateDataVersion here
     // it cause a lot of unnecessary requests to the server without any benefit
     // we just remove feed from frontend
 
     delete feeds.value[feedId];
+
+    triggerRef(feeds);
   }
 
   async function subscribe(url: t.URL) {
-    await api.addFeed({
+    const newFeed = await api.addFeed({
       url: url
     });
 
-    globalSettings.updateDataVersion();
+    // Attention, do not update globalSettings.updateDataVersion here (see above)
+
+    feeds.value[newFeed.id] = newFeed;
+
+    triggerRef(feeds);
   }
 
   return {

package/tsconfig.app.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {

package/tsconfig.node.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.node.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
   "compilerOptions": {
     "composite": true,