From 81736cebf59af49fb24f9284e940efd7570d4e36 Mon Sep 17 00:00:00 2001
From: Mathias Koehler <mail@mathias.im>
Date: Sat, 25 Mar 2023 00:30:40 +0100
Subject: [PATCH] Fix status loading by instance

---
 src/store/modules/status.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 5b908c3c..cfd1db08 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -114,7 +114,7 @@ const status = {
         commit('SET_STATUSES_BY_INSTANCE', [])
       } else {
         const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
-          ? await fetchStatuses(
+          ? (await fetchStatuses(
             {
               godmode: state.statusesByInstance.showPrivate,
               localOnly: state.statusesByInstance.showLocal,
@@ -122,17 +122,17 @@ const status = {
               token: getters.token,
               pageSize: state.statusesByInstance.pageSize,
               page: state.statusesByInstance.page
-            })
-          : await fetchStatusesByInstance(
+            })).data
+          : (await fetchStatusesByInstance(
             {
               instance: state.statusesByInstance.selectedInstance,
               authHost: getters.authHost,
               token: getters.token,
               pageSize: state.statusesByInstance.pageSize,
               page: state.statusesByInstance.page
-            })
-        commit('SET_STATUSES_BY_INSTANCE', statuses.data)
-        if (statuses.data.length < state.statusesByInstance.pageSize) {
+            })).data.activities
+        commit('SET_STATUSES_BY_INSTANCE', statuses)
+        if (statuses.length < state.statusesByInstance.pageSize) {
           commit('SET_ALL_LOADED', true)
         }
       }
@@ -141,7 +141,7 @@ const status = {
     async FetchStatusesPageByInstance({ commit, getters, rootState, state }) {
       commit('SET_BUTTON_LOADING', true)
       const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
-        ? await fetchStatuses(
+        ? (await fetchStatuses(
           {
             godmode: state.statusesByInstance.showPrivate,
             localOnly: state.statusesByInstance.showLocal,
@@ -149,18 +149,18 @@ const status = {
             token: getters.token,
             pageSize: state.statusesByInstance.pageSize,
             page: state.statusesByInstance.page
-          })
-        : await fetchStatusesByInstance(
+          })).data
+        : (await fetchStatusesByInstance(
           {
             instance: state.statusesByInstance.selectedInstance,
             authHost: getters.authHost,
             token: getters.token,
             pageSize: state.statusesByInstance.pageSize,
             page: state.statusesByInstance.page
-          })
-      commit('PUSH_STATUSES', statuses.data)
+          })).data.activities
+      commit('PUSH_STATUSES', statuses)
       commit('SET_BUTTON_LOADING', false)
-      if (statuses.data.length < state.statusesByInstance.pageSize) {
+      if (statuses.length < state.statusesByInstance.pageSize) {
         commit('SET_ALL_LOADED', true)
       }
     },