From d611c7d0e54e653e8b4249b789724a4f88ab1602 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 27 Feb 2020 22:25:50 +0300
Subject: [PATCH 1/7] Add api function and  action to fetch statuses

---
 CHANGELOG.md                 |  6 ++++++
 src/api/status.js            |  9 +++++++++
 src/store/getters.js         |  4 +---
 src/store/modules/status.js  |  7 ++++++-
 src/views/statuses/index.vue | 11 ++++++-----
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfd8927e..bdefcea9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+### Added
+
+- Ability to see local statuses in Statuses by instance section
+
 ## [2.0] - 2020-02-27
 
 ### Added
diff --git a/src/api/status.js b/src/api/status.js
index 676cd9dc..9feb8754 100644
--- a/src/api/status.js
+++ b/src/api/status.js
@@ -21,6 +21,15 @@ export async function deleteStatus(id, authHost, token) {
   })
 }
 
+export async function fetchStatuses({ godmode, localOnly, authHost, token }) {
+  return await request({
+    baseURL: baseName(authHost),
+    url: `/api/pleroma/admin/statuses?godmode=${godmode}&local_only=${localOnly}`,
+    method: 'get',
+    headers: authHeaders(token)
+  })
+}
+
 export async function fetchStatusesByInstance({ instance, authHost, token, pageSize, page }) {
   return await request({
     baseURL: baseName(authHost),
diff --git a/src/store/getters.js b/src/store/getters.js
index d51dbd28..f58f0c6b 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -17,8 +17,6 @@ const getters = {
   errorLogs: state => state.errorLog.logs,
   users: state => state.users.fetchedUsers,
   authHost: state => state.user.authHost,
-  settings: state => state.settings,
-  instances: state => state.peers.fetchedPeers,
-  statuses: state => state.status.fetchedStatuses
+  settings: state => state.settings
 }
 export default getters
diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 81e86dba..7f547d34 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -1,4 +1,4 @@
-import { changeStatusScope, deleteStatus, fetchStatusesByInstance } from '@/api/status'
+import { changeStatusScope, deleteStatus, fetchStatuses, fetchStatusesByInstance } from '@/api/status'
 
 const status = {
   state: {
@@ -48,6 +48,11 @@ const status = {
         dispatch('FetchStatusesByInstance')
       }
     },
+    async FetchStatuses({ commit, getters }, { godmode, localOnly }) {
+      commit('SET_LOADING', true)
+      await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
+      commit('SET_LOADING', false)
+    },
     async FetchStatusesByInstance({ commit, getters, state }) {
       commit('SET_LOADING', true)
       const statuses = state.statusesByInstance.selectedInstance === ''
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index b6fd2019..7ecd649f 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -36,7 +36,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import MultipleUsersMenu from '@/views/users/components/MultipleUsersMenu'
 import Status from '@/components/Status'
 
@@ -52,10 +51,9 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
-      'instances',
-      'statuses'
-    ]),
+    instances() {
+      return ['Local statuses', ...this.$store.state.peers.fetchedPeers]
+    },
     isDesktop() {
       return this.$store.state.app.device === 'desktop'
     },
@@ -75,6 +73,9 @@ export default {
       set(instance) {
         this.$store.dispatch('HandleFilterChange', instance)
       }
+    },
+    statuses() {
+      return this.$store.state.status.fetchedStatuses
     }
   },
   mounted() {

From 566d0fef5fdb64a2a247cee63fcedb91525bffd3 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 28 Feb 2020 23:42:16 +0300
Subject: [PATCH 2/7] Show current instance's statuses

---
 src/store/modules/status.js  | 38 +++++++++++++++++++++++-------------
 src/views/statuses/index.vue |  3 ++-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 7f547d34..0760f87d 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -50,23 +50,33 @@ const status = {
     },
     async FetchStatuses({ commit, getters }, { godmode, localOnly }) {
       commit('SET_LOADING', true)
-      await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
+      const statuses = await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
+      commit('SET_STATUSES_BY_INSTANCE', statuses.data)
       commit('SET_LOADING', false)
     },
-    async FetchStatusesByInstance({ commit, getters, state }) {
+    async FetchStatusesByInstance({ commit, getters, state, rootState }) {
       commit('SET_LOADING', true)
-      const statuses = state.statusesByInstance.selectedInstance === ''
-        ? { 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 (state.statusesByInstance.selectedInstance === '') {
+        commit('SET_STATUSES_BY_INSTANCE', [])
+      } else {
+        const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
+          ? await fetchStatuses(
+            {
+              godmode: false,
+              localOnly: false,
+              authHost: getters.authHost,
+              token: getters.token
+            })
+          : 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)
+      }
       commit('SET_LOADING', false)
     },
     async FetchStatusesPageByInstance({ commit, getters, state }) {
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 7ecd649f..fe9d9345 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -22,6 +22,7 @@
         :selected-users="selectedUsers"
         @apply-action="clearSelection"/>
     </div>
+    <p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
     <div v-for="status in statuses" :key="status.id" class="status-container">
       <status
         :status="status"
@@ -52,7 +53,7 @@ export default {
   },
   computed: {
     instances() {
-      return ['Local statuses', ...this.$store.state.peers.fetchedPeers]
+      return [this.$store.state.user.authHost, ...this.$store.state.peers.fetchedPeers]
     },
     isDesktop() {
       return this.$store.state.app.device === 'desktop'

From d2f78d23686f98062685a4af73e8f4ba77d4fd27 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sat, 29 Feb 2020 01:02:40 +0300
Subject: [PATCH 3/7] Add checkboxes to show only local and and private
 statuses

---
 src/lang/en.js               |  5 +++--
 src/store/modules/status.js  | 26 ++++++++++++++++++--------
 src/views/statuses/index.vue | 34 +++++++++++++++++++++++++++++++++-
 src/views/users/show.vue     |  2 +-
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 7512ecbf..8b8e9ff7 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -244,7 +244,9 @@ export default {
     statuses: 'Statuses by instance',
     instanceFilter: 'Instance filter',
     loadMore: 'Load more',
-    noInstances: 'No other instances found'
+    noInstances: 'No other instances found',
+    onlyLocalStatuses: 'Show only local statuses',
+    showPrivateStatuses: 'Show private statuses'
   },
   userProfile: {
     tags: 'Tags',
@@ -255,7 +257,6 @@ export default {
     localUppercase: 'Local',
     nickname: 'Nickname',
     recentStatuses: 'Recent Statuses',
-    showPrivateStatuses: 'Show private statuses',
     roles: 'Roles',
     activeUppercase: 'Active',
     active: 'active',
diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 0760f87d..281e4524 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -6,11 +6,19 @@ const status = {
     loading: false,
     statusesByInstance: {
       selectedInstance: '',
+      showLocal: false,
+      showPrivate: false,
       page: 1,
       pageSize: 30
     }
   },
   mutations: {
+    CHANGE_GODMODE_CHECKBOX_VALUE: (state, value) => {
+      state.statusesByInstance.showPrivate = value
+    },
+    CHANGE_LOCAL_CHECKBOX_VALUE: (state, value) => {
+      state.statusesByInstance.showLocal = value
+    },
     CHANGE_PAGE: (state, page) => {
       state.statusesByInstance.page = page
     },
@@ -48,12 +56,6 @@ const status = {
         dispatch('FetchStatusesByInstance')
       }
     },
-    async FetchStatuses({ commit, getters }, { godmode, localOnly }) {
-      commit('SET_LOADING', true)
-      const statuses = await fetchStatuses({ godmode, localOnly, authHost: getters.authHost, token: getters.token })
-      commit('SET_STATUSES_BY_INSTANCE', statuses.data)
-      commit('SET_LOADING', false)
-    },
     async FetchStatusesByInstance({ commit, getters, state, rootState }) {
       commit('SET_LOADING', true)
       if (state.statusesByInstance.selectedInstance === '') {
@@ -62,8 +64,8 @@ const status = {
         const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
           ? await fetchStatuses(
             {
-              godmode: false,
-              localOnly: false,
+              godmode: state.statusesByInstance.showPrivate,
+              localOnly: state.statusesByInstance.showLocal,
               authHost: getters.authHost,
               token: getters.token
             })
@@ -93,6 +95,14 @@ const status = {
       commit('PUSH_STATUSES', statuses.data)
       commit('SET_LOADING', false)
     },
+    HandleGodmodeCheckboxChange({ commit, dispatch }, value) {
+      commit('CHANGE_GODMODE_CHECKBOX_VALUE', value)
+      dispatch('FetchStatusesByInstance')
+    },
+    HandleLocalCheckboxChange({ commit, dispatch }, value) {
+      commit('CHANGE_LOCAL_CHECKBOX_VALUE', value)
+      dispatch('FetchStatusesByInstance')
+    },
     HandleFilterChange({ commit }, instance) {
       commit('CHANGE_SELECTED_INSTANCE', instance)
     },
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index fe9d9345..1c17eaa5 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -22,6 +22,14 @@
         :selected-users="selectedUsers"
         @apply-action="clearSelection"/>
     </div>
+    <div v-if="currentInstance" class="checkbox-container">
+      <el-checkbox v-model="showLocal" class="show-private-statuses">
+        {{ $t('statuses.onlyLocalStatuses') }}
+      </el-checkbox>
+      <el-checkbox v-model="showPrivate" class="show-private-statuses">
+        {{ $t('statuses.showPrivateStatuses') }}
+      </el-checkbox>
+    </div>
     <p v-if="statuses.length === 0" class="no-statuses">{{ $t('userProfile.noStatuses') }}</p>
     <div v-for="status in statuses" :key="status.id" class="status-container">
       <status
@@ -52,6 +60,9 @@ export default {
     }
   },
   computed: {
+    currentInstance() {
+      return this.selectedInstance === this.$store.state.user.authHost
+    },
     instances() {
       return [this.$store.state.user.authHost, ...this.$store.state.peers.fetchedPeers]
     },
@@ -75,6 +86,22 @@ export default {
         this.$store.dispatch('HandleFilterChange', instance)
       }
     },
+    showLocal: {
+      get() {
+        return this.$store.state.status.statusesByInstance.showLocal
+      },
+      set(value) {
+        this.$store.dispatch('HandleLocalCheckboxChange', value)
+      }
+    },
+    showPrivate: {
+      get() {
+        return this.$store.state.status.statusesByInstance.showPrivate
+      },
+      set(value) {
+        this.$store.dispatch('HandleGodmodeCheckboxChange', value)
+      }
+    },
     statuses() {
       return this.$store.state.status.fetchedStatuses
     }
@@ -99,7 +126,6 @@ export default {
       if (this.selectedUsers.find(selectedUser => user.id === selectedUser.id) !== undefined) {
         return
       }
-
       this.selectedUsers = [...this.selectedUsers, user]
     }
   }
@@ -113,6 +139,9 @@ export default {
     margin: 0 0 10px;
   }
 }
+.checkbox-container {
+  margin-bottom: 15px;
+}
 .filter-container {
   display: flex;
   height: 36px;
@@ -132,6 +161,9 @@ h1 {
 }
 
 @media only screen and (max-width:480px) {
+  .checkbox-container {
+    margin-bottom: 10px;
+  }
   .filter-container {
     display: flex;
     height: 36px;
diff --git a/src/views/users/show.vue b/src/views/users/show.vue
index ca0ed538..fd24486d 100644
--- a/src/views/users/show.vue
+++ b/src/views/users/show.vue
@@ -80,7 +80,7 @@
       <div class="recent-statuses-container">
         <h2 class="recent-statuses">{{ $t('userProfile.recentStatuses') }}</h2>
         <el-checkbox v-model="showPrivate" class="show-private-statuses" @change="onTogglePrivate">
-          {{ $t('userProfile.showPrivateStatuses') }}
+          {{ $t('statuses.showPrivateStatuses') }}
         </el-checkbox>
         <el-timeline v-if="!statusesLoading" class="statuses">
           <el-timeline-item v-for="status in statuses" :key="status.id">

From 48d9e1a48a04a51f07ee80dde5428509b3a7efce Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 2 Mar 2020 21:26:19 +0300
Subject: [PATCH 4/7] Prevent reloading statuses after page was changed

---
 src/store/modules/status.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 281e4524..c0cf5b0f 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -82,7 +82,6 @@ const status = {
       commit('SET_LOADING', false)
     },
     async FetchStatusesPageByInstance({ commit, getters, state }) {
-      commit('SET_LOADING', true)
       const statuses = await fetchStatusesByInstance(
         {
           instance: state.statusesByInstance.selectedInstance,
@@ -93,7 +92,6 @@ const status = {
         })
 
       commit('PUSH_STATUSES', statuses.data)
-      commit('SET_LOADING', false)
     },
     HandleGodmodeCheckboxChange({ commit, dispatch }, value) {
       commit('CHANGE_GODMODE_CHECKBOX_VALUE', value)

From c8f07c85fa82da2649c5bae8fae6483019d3d836 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 2 Mar 2020 22:01:08 +0300
Subject: [PATCH 5/7] Add loading button

---
 src/store/modules/status.js  | 8 +++++++-
 src/views/statuses/index.vue | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index c0cf5b0f..7e3663fe 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -9,7 +9,8 @@ const status = {
       showLocal: false,
       showPrivate: false,
       page: 1,
-      pageSize: 30
+      pageSize: 30,
+      buttonLoading: false
     }
   },
   mutations: {
@@ -31,6 +32,9 @@ const status = {
     PUSH_STATUSES: (state, statuses) => {
       state.fetchedStatuses = [...state.fetchedStatuses, ...statuses]
     },
+    SET_BUTTON_LOADING: (state, status) => {
+      state.statusesByInstance.buttonLoading = status
+    },
     SET_LOADING: (state, status) => {
       state.loading = status
     }
@@ -82,6 +86,7 @@ const status = {
       commit('SET_LOADING', false)
     },
     async FetchStatusesPageByInstance({ commit, getters, state }) {
+      commit('SET_BUTTON_LOADING', true)
       const statuses = await fetchStatusesByInstance(
         {
           instance: state.statusesByInstance.selectedInstance,
@@ -92,6 +97,7 @@ const status = {
         })
 
       commit('PUSH_STATUSES', statuses.data)
+      commit('SET_BUTTON_LOADING', false)
     },
     HandleGodmodeCheckboxChange({ commit, dispatch }, value) {
       commit('CHANGE_GODMODE_CHECKBOX_VALUE', value)
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 1c17eaa5..29187df7 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -39,7 +39,7 @@
         @status-selection="handleStatusSelection" />
     </div>
     <div v-if="statuses.length > 0" class="statuses-pagination">
-      <el-button @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
+      <el-button :loading="buttonLoading" @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
     </div>
   </div>
 </template>
@@ -60,6 +60,9 @@ export default {
     }
   },
   computed: {
+    buttonLoading() {
+      return this.$store.state.status.statusesByInstance.buttonLoading
+    },
     currentInstance() {
       return this.selectedInstance === this.$store.state.user.authHost
     },

From 6eedb80dbbc02c77a596d78dbbdb42cae89b8549 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 2 Mar 2020 22:36:54 +0300
Subject: [PATCH 6/7] Add success button when all statuses were loaded

---
 src/store/modules/status.js  | 16 +++++++++++++---
 src/views/statuses/index.vue |  6 +++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index 7e3663fe..ae0e054c 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -9,8 +9,9 @@ const status = {
       showLocal: false,
       showPrivate: false,
       page: 1,
-      pageSize: 30,
-      buttonLoading: false
+      pageSize: 1,
+      buttonLoading: false,
+      allLoaded: false
     }
   },
   mutations: {
@@ -32,6 +33,9 @@ const status = {
     PUSH_STATUSES: (state, statuses) => {
       state.fetchedStatuses = [...state.fetchedStatuses, ...statuses]
     },
+    SET_ALL_LOADED: (state, status) => {
+      state.statusesByInstance.allLoaded = status
+    },
     SET_BUTTON_LOADING: (state, status) => {
       state.statusesByInstance.buttonLoading = status
     },
@@ -82,6 +86,9 @@ const status = {
               page: state.statusesByInstance.page
             })
         commit('SET_STATUSES_BY_INSTANCE', statuses.data)
+        if (statuses.data.length < state.statusesByInstance.pageSize) {
+          commit('SET_ALL_LOADED', true)
+        }
       }
       commit('SET_LOADING', false)
     },
@@ -95,9 +102,11 @@ const status = {
           pageSize: state.statusesByInstance.pageSize,
           page: state.statusesByInstance.page
         })
-
       commit('PUSH_STATUSES', statuses.data)
       commit('SET_BUTTON_LOADING', false)
+      if (statuses.data.length < state.statusesByInstance.pageSize) {
+        commit('SET_ALL_LOADED', true)
+      }
     },
     HandleGodmodeCheckboxChange({ commit, dispatch }, value) {
       commit('CHANGE_GODMODE_CHECKBOX_VALUE', value)
@@ -109,6 +118,7 @@ const status = {
     },
     HandleFilterChange({ commit }, instance) {
       commit('CHANGE_SELECTED_INSTANCE', instance)
+      commit('SET_ALL_LOADED', false)
     },
     HandlePageChange({ commit }, page) {
       commit('CHANGE_PAGE', page)
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 29187df7..05e4a73f 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -39,7 +39,8 @@
         @status-selection="handleStatusSelection" />
     </div>
     <div v-if="statuses.length > 0" class="statuses-pagination">
-      <el-button :loading="buttonLoading" @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
+      <el-button v-if="!allLoaded" :loading="buttonLoading" @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
+      <el-button v-else type="success" icon="el-icon-check" circle/>
     </div>
   </div>
 </template>
@@ -60,6 +61,9 @@ export default {
     }
   },
   computed: {
+    allLoaded() {
+      return this.$store.state.status.statusesByInstance.allLoaded
+    },
     buttonLoading() {
       return this.$store.state.status.statusesByInstance.buttonLoading
     },

From cc8b2be03006fd6241cd6c4ea52d3d1cef680549 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 2 Mar 2020 23:08:38 +0300
Subject: [PATCH 7/7] Add pagination for fetching local statuses

---
 src/api/status.js            |  4 ++--
 src/store/modules/status.js  | 40 ++++++++++++++++++++++++++----------
 src/views/statuses/index.vue |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/api/status.js b/src/api/status.js
index 9feb8754..37f7e0c2 100644
--- a/src/api/status.js
+++ b/src/api/status.js
@@ -21,10 +21,10 @@ export async function deleteStatus(id, authHost, token) {
   })
 }
 
-export async function fetchStatuses({ godmode, localOnly, authHost, token }) {
+export async function fetchStatuses({ godmode, localOnly, authHost, token, pageSize, page }) {
   return await request({
     baseURL: baseName(authHost),
-    url: `/api/pleroma/admin/statuses?godmode=${godmode}&local_only=${localOnly}`,
+    url: `/api/pleroma/admin/statuses?godmode=${godmode}&local_only=${localOnly}&page=${page}&page_size=${pageSize}`,
     method: 'get',
     headers: authHeaders(token)
   })
diff --git a/src/store/modules/status.js b/src/store/modules/status.js
index ae0e054c..e0cc5d97 100644
--- a/src/store/modules/status.js
+++ b/src/store/modules/status.js
@@ -9,7 +9,7 @@ const status = {
       showLocal: false,
       showPrivate: false,
       page: 1,
-      pageSize: 1,
+      pageSize: 20,
       buttonLoading: false,
       allLoaded: false
     }
@@ -75,7 +75,9 @@ const status = {
               godmode: state.statusesByInstance.showPrivate,
               localOnly: state.statusesByInstance.showLocal,
               authHost: getters.authHost,
-              token: getters.token
+              token: getters.token,
+              pageSize: state.statusesByInstance.pageSize,
+              page: state.statusesByInstance.page
             })
           : await fetchStatusesByInstance(
             {
@@ -92,16 +94,26 @@ const status = {
       }
       commit('SET_LOADING', false)
     },
-    async FetchStatusesPageByInstance({ commit, getters, state }) {
+    async FetchStatusesPageByInstance({ commit, getters, rootState, state }) {
       commit('SET_BUTTON_LOADING', true)
-      const statuses = await fetchStatusesByInstance(
-        {
-          instance: state.statusesByInstance.selectedInstance,
-          authHost: getters.authHost,
-          token: getters.token,
-          pageSize: state.statusesByInstance.pageSize,
-          page: state.statusesByInstance.page
-        })
+      const statuses = state.statusesByInstance.selectedInstance === rootState.user.authHost
+        ? await fetchStatuses(
+          {
+            godmode: state.statusesByInstance.showPrivate,
+            localOnly: state.statusesByInstance.showLocal,
+            authHost: getters.authHost,
+            token: getters.token,
+            pageSize: state.statusesByInstance.pageSize,
+            page: state.statusesByInstance.page
+          })
+        : 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)
       commit('SET_BUTTON_LOADING', false)
       if (statuses.data.length < state.statusesByInstance.pageSize) {
@@ -109,10 +121,16 @@ const status = {
       }
     },
     HandleGodmodeCheckboxChange({ commit, dispatch }, value) {
+      dispatch('HandlePageChange', 1)
+      commit('SET_ALL_LOADED', false)
+
       commit('CHANGE_GODMODE_CHECKBOX_VALUE', value)
       dispatch('FetchStatusesByInstance')
     },
     HandleLocalCheckboxChange({ commit, dispatch }, value) {
+      dispatch('HandlePageChange', 1)
+      commit('SET_ALL_LOADED', false)
+
       commit('CHANGE_LOCAL_CHECKBOX_VALUE', value)
       dispatch('FetchStatusesByInstance')
     },
diff --git a/src/views/statuses/index.vue b/src/views/statuses/index.vue
index 05e4a73f..74e3f55b 100644
--- a/src/views/statuses/index.vue
+++ b/src/views/statuses/index.vue
@@ -40,7 +40,7 @@
     </div>
     <div v-if="statuses.length > 0" class="statuses-pagination">
       <el-button v-if="!allLoaded" :loading="buttonLoading" @click="handleLoadMore">{{ $t('statuses.loadMore') }}</el-button>
-      <el-button v-else type="success" icon="el-icon-check" circle/>
+      <el-button v-else icon="el-icon-check" circle/>
     </div>
   </div>
 </template>