feeds-fun 1.22.0 → 1.22.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "author": "Aliaksei Yaletski (Tiendil) <a.eletsky@gmail.com> (https://tiendil.org/)",
   "description": "Frontend for the Feeds Fun — web-based news reader",
   "keywords": [
@@ -38,6 +38,7 @@
     "axios": "^1.7.7",
     "dompurify": "^3.1.7",
     "lodash": "^4.17.21",
+    "neverthrow": "^8.2.0",
     "pinia": "^2.2.6",
     "set-interval-async": "^3.0.3",
     "vanilla-cookieconsent": "^3.1.0",
@@ -49,7 +50,7 @@
     "@tailwindcss/typography": "^0.5.15",
     "@types/dompurify": "^3.0.5",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.21",
     "@types/node": "^22.9.0",
     "@vitejs/plugin-vue": "^5.1.4",
     "@vue/eslint-config-prettier": "^10.1.0",
@@ -58,6 +59,7 @@
     "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.20",
     "eslint": "^9.14.0",
+    "eslint-plugin-neverthrow": "^1.1.4",
     "eslint-plugin-vue": "^9.30.0",
     "jsdom": "^25.0.1",
     "npm-run-all": "^4.1.5",

package/src/components/OPMLUpload.vue

@@ -30,9 +30,9 @@
 
     <p
       v-if="error"
-      class="ffun-info-bad mt-4"
-      >Error occurred! Maybe you chose a wrong file?</p
-    >
+      class="ffun-info-bad mt-4">
+      {{ errorMessage }}
+    </p>
   </div>
 </template>
 
@@ -52,6 +52,7 @@
   const loading = ref(false);
   const loaded = ref(false);
   const error = ref(false);
+  const errorMessage = ref("");
 
   function uploadFile(event: Event) {
     opmlFile.value = (event.target as HTMLInputElement).files?.[0] ?? null;
@@ -77,20 +78,30 @@
     });
 
     try {
-      await api.addOPML({content: content});
-
-      // loading an OPML file is pretty rare and significantly changes the list of feeds
-      // => we can force data to be reloaded
-      globalSettings.updateDataVersion();
+      let result = await api.addOPML({content: content});
+
+      result.match(
+        // loading an OPML file is pretty rare and significantly changes the list of feeds
+        // => we can force data to be reloaded
+        (data) => {
+          globalSettings.updateDataVersion();
+          error.value = false;
+          loaded.value = true;
+        },
+        (err) => {
+          error.value = true;
+          errorMessage.value = err.message;
+          loaded.value = false;
+        }
+      );
 
       loading.value = false;
-      loaded.value = true;
-      error.value = false;
     } catch (e) {
       console.error(e);
       loading.value = false;
       loaded.value = false;
       error.value = true;
+      errorMessage.value = "Error occurred! Maybe you chose a wrong file?";
     }
   }
 </script>

package/src/components/tags/TagsFilter.vue

@@ -169,10 +169,10 @@
       const tagInfo = tagsStore.tags[tag];
 
       if (tagInfo === undefined || tagInfo.name === null) {
-        return tag.includes(tagNameFilter.value);
+        return tag.includes(textFilter);
       }
 
-      return tagInfo.name.includes(tagNameFilter.value);
+      return tagInfo.name.includes(textFilter);
     });
 
     return values;

package/src/logic/api.ts

@@ -5,6 +5,7 @@ import type * as e from "@/logic/enums";
 import * as settings from "@/logic/settings";
 import * as cookieConsent from "@/plugins/CookieConsent";
 import {useGlobalState} from "@/stores/globalState";
+import {ok, err, Result} from "neverthrow";
 
 ///////////////
 // API handlers
@@ -13,6 +14,8 @@ import {useGlobalState} from "@/stores/globalState";
 const publicEntryPoint = "/spa/api/public";
 const privateEntryPoint = "/spa/api/private";
 
+export const downloadOPMLUrl = `${privateEntryPoint}/get-opml`;
+
 const apiPublic = axios.create({baseURL: publicEntryPoint, withCredentials: true});
 const apiPrivate = axios.create({baseURL: privateEntryPoint, withCredentials: true});
 
@@ -101,11 +104,22 @@ async function postPublic({url, data}: {url: string; data: any}) {
   return response.data;
 }
 
+// TODO: deprecated, use postPrivateResult instead
 async function postPrivate({url, data, config}: {url: string; data: any; config?: any}) {
   const response = await apiPrivate.post(url, data, config);
   return response.data;
 }
 
+async function postPrivateResult({url, data, config}: {url: string; data: any; config?: any}) {
+  const response = await apiPrivate.post(url, data, config);
+
+  if (response.data.status === "error") {
+    return err(new t.ApiError(response.data.code, response.data.message));
+  }
+
+  return ok(response.data.data);
+}
+
 /////////////
 // Public API
 /////////////
@@ -410,7 +424,7 @@ export async function addFeed({url}: {url: string}) {
 }
 
 export async function addOPML({content}: {content: string}) {
-  await postPrivate({url: "/add-opml", data: {content: content}});
+  return await postPrivateResult({url: "/add-opml", data: {content: content}});
 }
 
 export async function unsubscribe({feedId}: {feedId: t.FeedId}) {

package/src/logic/types.ts

@@ -557,3 +557,13 @@ export class userInfo {
 export function userInfoFromJSON({userId}: {userId: string}): userInfo {
   return new userInfo({userId});
 }
+
+export class ApiError {
+  readonly code: string;
+  readonly message: string;
+
+  constructor(code: string, message: string) {
+    this.code = code;
+    this.message = message;
+  }
+}

package/src/views/FeedsView.vue

@@ -28,7 +28,7 @@
     <template #side-menu-item-4>
       <a
         class="ffun-form-button p-1 my-1 block w-full text-center"
-        href="/api/get-opml"
+        :href="api.downloadOPMLUrl"
         target="_blank"
         title="Download OPML file with all your feeds"
         >Download OPML</a