timeline upgrade

ghobs91 · Dec 30, 2023 · 83dc352 · 83dc352
1 parent 0960c45
commit 83dc352
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/app.jsx b/src/app.jsx
@@ -85,6 +85,7 @@ function App() {
   const instanceURL = store.local.get('instanceURL');
   const myCurrentInstance = api().instance;
   const { instance } = api();
+  const { masto } = api({ instance });
   const formattedShortcuts = [
     {
       icon: "home",
@@ -115,6 +116,8 @@ function App() {
     },
   ]
 
+
+
   useLayoutEffect(() => {
     const theme = store.local.get('theme');
     if (theme) {

diff --git a/src/components/timeline.jsx b/src/components/timeline.jsx
@@ -6,7 +6,7 @@ import { useSnapshot } from 'valtio';
 
 import states, { statusKey } from '../utils/states';
 import statusPeek from '../utils/status-peek';
-import { groupBoosts, groupContext } from '../utils/timeline-utils';
+import { groupBoosts, groupContext, applyMutedWords } from '../utils/timeline-utils';
 import useInterval from '../utils/useInterval';
 import usePageVisibility from '../utils/usePageVisibility';
 import useScroll from '../utils/useScroll';
@@ -64,7 +64,10 @@ function Timeline({
               value = groupBoosts(value);
             }
             value = groupContext(value);
-            console.log(value);
+            if (value) {
+              value = applyMutedWords(value);
+            }
+            // console.log(value);
             if (firstLoad) {
               setItems(value);
             } else {

diff --git a/src/utils/timeline-utils.jsx b/src/utils/timeline-utils.jsx
@@ -1,4 +1,5 @@
 import store from './store';
+import { api } from './api';
 
 export function groupBoosts(values) {
   let newValues = [];
@@ -49,6 +50,36 @@ export function groupBoosts(values) {
   }
 }
 
+export function applyMutedWords(values) {
+  const { masto } = api();
+  (async () => {
+    try {
+      const filterResults = await masto.v2.filters.fetch({
+        resolve: true
+      });
+      if (filterResults) {
+        let newValues = [];
+        console.log(`users filters: ${filterResults}`);
+        values.forEach((value) => {
+          filterResults.forEach((filterList) => {
+            filterList.keywords.forEach((keyword) => {
+              if (value.indexOf(keyword) === -1) {
+                newValues.push(value);
+              }
+            });
+          });
+        });
+        return newValues;
+      } else {
+        return values;
+      }
+    } catch (e) {
+      alert('Error: ' + e);
+      console.error(e);
+    }
+  })();
+}
+
 export function dedupeBoosts(items, instance) {
   const boostedStatusIDs = store.account.get('boostedStatusIDs') || {};
   const filteredItems = items.filter((item) => {