Merge branch 'more-fixes' into shigusegubu-themes3

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) {

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
       })
     },