From b817b97d1a7fd3a96ff958a7674af3f0f3921452 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 30 Jun 2026 07:15:21 +0300
Subject: [PATCH 1/2] maybe/get

---
 src/components/conversation/conversation.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 696167831..a894348af 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -358,9 +358,6 @@ const conversation = {
     canDive() {
       return this.isTreeView && this.isExpanded
     },
-    maybeHighlight() {
-      return this.isExpanded ? this.highlight : null
-    },
     ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
     ...mapState({
       mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
@@ -435,7 +432,7 @@ const conversation = {
     getReplies(id) {
       return this.replies[id] || []
     },
-    getHighlight() {
+    maybeHighlight() {
       return this.isExpanded ? this.highlight : null
     },
     setHighlight(id) {

From afce78a59794f5ed29faba60826bec9537776d30 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 30 Jun 2026 14:10:13 +0300
Subject: [PATCH 2/2] fix vaartis error for realsies this time

---
 src/modules/statuses.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5bc852be1..6b71fa5e9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -883,9 +883,11 @@ const statuses = {
           'addNewUsers',
           data.statuses.map((s) => s.user).filter((u) => u),
         )
-        data.statuses = store.dispatch('addNewStatuses', {
+        store.commit('addNewStatuses', {
           statuses: data.statuses,
         })
+
+        data.statuses = data.statuses.map((s) => store.state.allStatusesObject[s.id])
         return data
       })
     },