feeds-fun 1.22.5 → 1.22.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.22.5",
+  "version": "1.22.7",
   "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/RuleForList.vue

@@ -24,6 +24,7 @@
           v-for="tag of rule.tags"
           :key="tag"
           :uid="tag"
+          :excluded="rule.excludedTags.includes(tag)"
           :css-modifier="cssModifiers[tag]" />
       </div>
     </div>
@@ -80,11 +81,11 @@
 
   const cssModifiers: {[key: string]: string} = {};
 
+  const modifier = properties.rule.score > 0 ? "positive" : "negative";
+
+  console.log("score", properties.rule.score, "modifier", modifier);
+
   for (const tag of properties.rule.tags) {
-    if (properties.rule.excludedTags.includes(tag)) {
-      cssModifiers[tag] = "negative";
-      continue;
-    }
-    cssModifiers[tag] = "positive";
+    cssModifiers[tag] = modifier;
   }
 </script>

package/src/components/page_footer/Footer.vue

@@ -73,6 +73,14 @@
             Privacy Policy
           </a>
 
+          <a
+            v-if="settings.crmImpressum"
+            :href="router.resolve({name: 'impressum'}).href"
+            class="ffun-normal-link"
+            @click.prevent="router.push({name: 'impressum'})">
+            Impressum
+          </a>
+
           <a
             v-if="!globalState.isSingleUserMode"
             href="#"

package/src/components/tags/Base.vue

@@ -1,4 +1,5 @@
 <template>
+  <strong v-if="excluded">not </strong>
   <span>
     {{ tagInfo.name }}
 
@@ -26,5 +27,6 @@
 
   const properties = defineProps<{
     tagInfo: t.TagInfo;
+    excluded?: boolean;
   }>();
 </script>

package/src/components/tags/RuleTag.vue

@@ -2,7 +2,9 @@
   <div
     :class="classes"
     @click.prevent="onClick()">
-    <tag-base :tag-info="tagInfo" />
+    <tag-base
+      :tag-info="tagInfo"
+      :excluded="excluded" />
   </div>
 </template>
 
@@ -26,6 +28,7 @@
   const properties = defineProps<{
     uid: string;
     cssModifier: string;
+    excluded: boolean;
   }>();
 
   const tagInfo = computed(() => {

package/src/logic/settings.ts

@@ -4,7 +4,7 @@ export const version = __APP_VERSION__;
 
 export const authRefreshInterval = import.meta.env.VITE_FFUN_AUTH_REFRESH_INTERVAL || 10 * 60 * 1000;
 
-export const blog = import.meta.env.VITE_FFUN_BLOG || "https://blog.feeds.fun";
+export const blog = import.meta.env.VITE_FFUN_BLOG || "https://feeds.fun/blog";
 export const roadmap = import.meta.env.VITE_FFUN_ROADMAP || "https://github.com/users/Tiendil/projects/1";
 export const githubRepo = import.meta.env.VITE_FFUN_GITHUB_REPO || "https://github.com/Tiendil/feeds.fun";
 export const discordInvite = import.meta.env.VITE_FFUN_DISCORD_INVITE || "https://discord.gg/C5RVusHQXy";
@@ -20,6 +20,7 @@ export const utmLifetime = import.meta.env.VITE_FFUN_UTM_LIFETIME || 7; // days
 
 export const crmTerms = import.meta.env.VITE_FFUN_CRM_TERMS || null;
 export const crmPrivacy = import.meta.env.VITE_FFUN_CRM_PRIVACY || null;
+export const crmImpressum = import.meta.env.VITE_FFUN_CRM_IMPRESSUM || null;
 
 export const hasCollections = import.meta.env.VITE_FFUN_HAS_COLLECTIONS == "true" || false;
 

package/src/logic/utils.ts

@@ -137,7 +137,7 @@ export function chooseTagByUsage({
     exclude = [];
   }
 
-  const tags = _.toPairs(tagsCount).sort((a, b) => {
+  const tags = _.toPairs(tagsCount).sort((a: [string, number], b: [string, number]) => {
     if (a[1] === b[1]) {
       return a[0].localeCompare(b[0]);
     }

package/src/router/index.ts

@@ -69,6 +69,12 @@ const router = createRouter({
       component: CRMView,
       props: {content: settings.crmPrivacy, kind: "privacy"}
     },
+    {
+      path: "/impressum",
+      name: "impressum",
+      component: CRMView,
+      props: {content: settings.crmImpressum, kind: "impressum"}
+    },
     {
       path: "/:pathMatch(.*)*",
       redirect: "/"

package/src/stores/globalSettings.ts

@@ -139,19 +139,22 @@ export const useGlobalSettingsStore = defineStore("globalSettings", () => {
     );
   }
 
-  function enumBackendSettings(kind: string, enumProperties: any) {
-    const defaultEntry = _.find([...enumProperties], ([, prop]) => prop.default);
+  function enumBackendSettings<TValue extends t.UserSettingsValue, TProperty extends {default?: boolean}>(
+    kind: string,
+    enumProperties: Map<TValue, TProperty>
+  ) {
+    const defaultEntry = _.find([...enumProperties], ([, prop]: [TValue, TProperty]) => prop.default === true);
 
     if (!defaultEntry) {
       throw new Error(`No default entry found for enum "${kind}"`);
     }
 
-    let defaultValue = defaultEntry[0];
+    let defaultValue: TValue = defaultEntry[0];
 
     return backendSettings(
       kind,
       (rawValue: t.UserSettingsValue) => {
-        return enumProperties.has(rawValue);
+        return enumProperties.has(rawValue as TValue);
       },
       defaultValue
     );

package/vitest.config.ts

@@ -8,6 +8,7 @@ export default mergeConfig(
   defineConfig({
     test: {
       environment: 'jsdom',
+      dir: 'src',
       exclude: [...configDefaults.exclude, 'e2e/*'],
       root: fileURLToPath(new URL('./', import.meta.url))
     }