From 9983c8086cbf62dafa07a825ae83a99fbbbee368 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 20 Dec 2023 16:04:37 +0800
Subject: [PATCH] Only show followed hashtags for non-followings

---
 src/pages/following.jsx      |  6 +++++-
 src/utils/relationships.js   |  1 +
 src/utils/timeline-utils.jsx | 24 +++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/pages/following.jsx b/src/pages/following.jsx
index 3fab5e21..b6f3639a 100644
--- a/src/pages/following.jsx
+++ b/src/pages/following.jsx
@@ -31,7 +31,11 @@ function Following({ title, path, id, ...props }) {
     const results = await homeIterator.current.next();
     let { value } = results;
     if (value?.length) {
+      let latestItemChanged = false;
       if (firstLoad) {
+        if (value[0].id !== latestItem.current) {
+          latestItemChanged = true;
+        }
         latestItem.current = value[0].id;
         console.log('First load', latestItem.current);
       }
@@ -41,7 +45,7 @@ function Following({ title, path, id, ...props }) {
         saveStatus(item, instance);
       });
       value = dedupeBoosts(value, instance);
-      if (firstLoad) clearFollowedTagsState();
+      if (firstLoad && latestItemChanged) clearFollowedTagsState();
       assignFollowedTags(value, instance);
 
       // ENFORCE sort by datetime (Latest first)
diff --git a/src/utils/relationships.js b/src/utils/relationships.js
index da0ba266..eb80da5f 100644
--- a/src/utils/relationships.js
+++ b/src/utils/relationships.js
@@ -19,6 +19,7 @@ export async function fetchRelationships(accounts, relationshipsMap = {}) {
     }
     return acc;
   }, []);
+  if (!uniqueAccountIds.length) return null;
 
   try {
     const relationships = await masto.v1.accounts.relationships.fetch({
diff --git a/src/utils/timeline-utils.jsx b/src/utils/timeline-utils.jsx
index 7ba39535..128b4904 100644
--- a/src/utils/timeline-utils.jsx
+++ b/src/utils/timeline-utils.jsx
@@ -1,4 +1,5 @@
 import { extractTagsFromStatus, getFollowedTags } from './followed-tags';
+import { fetchRelationships } from './relationships';
 import states, { statusKey } from './states';
 import store from './store';
 
@@ -182,6 +183,8 @@ export async function assignFollowedTags(items, instance) {
   const followedTags = await getFollowedTags(); // [{name: 'tag'}, {...}]
   if (!followedTags.length) return;
   const { statusFollowedTags } = states;
+  console.log('statusFollowedTags', statusFollowedTags);
+  const statusWithFollowedTags = [];
   items.forEach((item) => {
     if (item.reblog) return;
     const { id, content, tags = [] } = item;
@@ -199,9 +202,28 @@ export async function assignFollowedTags(items, instance) {
       return acc;
     }, []);
     if (itemFollowedTags.length) {
-      statusFollowedTags[sKey] = itemFollowedTags;
+      // statusFollowedTags[sKey] = itemFollowedTags;
+      statusWithFollowedTags.push({
+        item,
+        sKey,
+        followedTags: itemFollowedTags,
+      });
     }
   });
+
+  if (statusWithFollowedTags.length) {
+    const accounts = statusWithFollowedTags.map((s) => s.item.account);
+    const relationships = await fetchRelationships(accounts);
+    if (!relationships) return;
+
+    statusWithFollowedTags.forEach((s) => {
+      const { item, sKey, followedTags } = s;
+      const r = relationships[item.account.id];
+      if (!r.following) {
+        statusFollowedTags[sKey] = followedTags;
+      }
+    });
+  }
 }
 
 export function clearFollowedTagsState() {