From 54b440b9f583a20617e6e20899109ef5744bb6c5 Mon Sep 17 00:00:00 2001
From: CoolElectronics <me@coolelectronics.me>
Date: Tue, 11 Jun 2024 17:22:25 -0400
Subject: [PATCH] fix reactions but actually this time

---
 .../emoji_reactions/emoji_reactions.vue       |  1 -
 src/components/status/status.js               | 56 +++++++++++--------
 .../user_list_popover/user_list_popover.vue   |  1 -
 src/modules/statuses.js                       | 18 +++---
 src/services/api/api.service.js               | 10 ++--
 5 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index be70d522..546d16c3 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -9,7 +9,6 @@
         class="emoji-reaction btn button-default"
         :class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
-        @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
         <span
           v-if="reaction.url !== null"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 8dea3809..2e49c30e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -564,33 +564,45 @@ const Status = {
   },
   async mounted () {
     if (this.status.refetched) return;
-    let data = await fetch("/api/notes/show", {
-        "headers": {
-            "Content-Type": "application/json",
-        },
-        "referrer": "https://grimgreenfo.rest/",
-        "body": JSON.stringify({ "noteId": this.status.id, i: "JEg68SCqcTaFpvF5" }),
-        "method": "POST",
-        "mode": "cors"
-    });
-    if (data.ok) {
-        let json = await data.json();
 
-      for (let reaction of this.status.emoji_reactions) {
-        
-        let image = json.reactionEmojis[reaction.name.substring(1).substring(0, reaction.name.length - 2)];
-        if (image) {
-          reaction.url = image;
-        }else {
+    if (this.status.emoji_reactions.length > 1 && this.status.emoji_reactions.some(reaction => reaction.name.startsWith(':'))) {
+      let data = await fetch("/api/notes/show", {
+          "headers": {
+              "Content-Type": "application/json",
+          },
+          "referrer": "https://grimgreenfo.rest/",
+          "body": JSON.stringify({ "noteId": this.status.id, }),
+          "method": "POST",
+          "mode": "cors"
+      });
+      if (data.ok) {
+          let json = await data.json();
 
-          let codepoint = reaction.name.codePointAt(0);
+        for (let reaction of this.status.emoji_reactions) {
+          
+          let image = json.reactionEmojis[reaction.name.substring(1).substring(0, reaction.name.length - 2)];
+          if (image) {
+            reaction.url = image;
+          }else {
+
+            let codepoint = reaction.name.codePointAt(0);
+
+            const hexCode = codepoint.toString(16).toLowerCase();
+            const baseUrl = "https://twemoji.maxcdn.com/v/latest/72x72/";
+            const url = `${baseUrl}${hexCode}.png`;
+            reaction.url = url;
+          }
 
-          const hexCode = codepoint.toString(16).toLowerCase();
-          const baseUrl = "https://twemoji.maxcdn.com/v/latest/72x72/";
-          const url = `${baseUrl}${hexCode}.png`;
-          reaction.url = url;
         }
+      }
+    } else {
+      for (let reaction of this.status.emoji_reactions) {
+        let codepoint = reaction.name.codePointAt(0);
 
+        const hexCode = codepoint.toString(16).toLowerCase();
+        const baseUrl = "https://twemoji.maxcdn.com/v/latest/72x72/";
+        const url = `${baseUrl}${hexCode}.png`;
+        reaction.url = url;
       }
     }
   }
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index a3ce54c3..61df7a11 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -1,6 +1,5 @@
 <template>
   <Popover
-    trigger="hover"
     placement="top"
     :offset="{ y: 5 }"
   >
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 97fc1d4d..356ffb7d 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -546,10 +546,10 @@ export const mutations = {
       ...reaction,
       count: reaction.count + 1,
       me: true,
-      accounts: [
-        ...reaction.accounts,
-        currentUser
-      ]
+      // accounts: [
+      //   ...reaction.accounts,
+      //   currentUser
+      // ]
     }
 
     // Update count of existing reaction if it exists, otherwise append at the end
@@ -755,11 +755,11 @@ const statuses = {
       )
     },
     fetchEmojiReactionsBy ({ rootState, commit }, id) {
-      rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
-        emojiReactions => {
-          commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
-        }
-      )
+      // rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
+      //   emojiReactions => {
+      //     commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
+      //   }
+      // )
     },
     fetchFavs ({ rootState, commit }, id) {
       rootState.api.backendInteractor.fetchFavoritedByUsers({ id })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 7950b698..7c21b407 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1357,16 +1357,18 @@ const fetchEmojiReactions = ({ id, credentials }) => {
 
 const reactWithEmoji = ({ id, emoji, credentials }) => {
   return promisedRequest({
-    url: PLEROMA_EMOJI_REACT_URL(id, encodeURIComponent(emoji)),
-    method: 'PUT',
+    url: "/api/v1/statuses/" + id + "/react/" + encodeURIComponent(emoji),
+    method: 'POST',
+    payload: {},
     credentials
   }).then(parseStatus)
 }
 
 const unreactWithEmoji = ({ id, emoji, credentials }) => {
   return promisedRequest({
-    url: PLEROMA_EMOJI_UNREACT_URL(id, encodeURIComponent(emoji)),
-    method: 'DELETE',
+    url: "/api/v1/statuses/" + id + "/unreact/" + encodeURIComponent(emoji),
+    method: 'POST',
+    payload: {},
     credentials
   }).then(parseStatus)
 }