aboutsummaryrefslogtreecommitdiff
path: root/src/modules/users.js
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-04-09 15:42:05 -0400
committerdave <starpumadev@gmail.com>2019-04-09 15:42:05 -0400
commitd498a26af5135e3f612769cf4f46bec978a99b20 (patch)
treec5d86873a5ebbc23bcdf03e7559d040f5d3e8e39 /src/modules/users.js
parentd3218807b4b363a09795857f9f366ad2a40d7d07 (diff)
parentd7cf841dfe6e434b27afed32ef2fcf214c5b6bc4 (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications
Diffstat (limited to 'src/modules/users.js')
-rw-r--r--src/modules/users.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/users.js b/src/modules/users.js
index b944cf61..cd789f09 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -355,7 +355,8 @@ const users = {
store.commit('setToken', false)
store.dispatch('stopFetching', 'friends')
store.commit('setBackendInteractor', backendInteractorService())
- store.dispatch('stopFetchingNotifications')
+ store.dispatch('stopFetching', 'notifications')
+ store.commit('clearNotifications')
store.commit('resetStatuses')
},
loginUser (store, accessToken) {
@@ -387,7 +388,10 @@ const users = {
}
// Start getting fresh posts.
- store.dispatch('startFetching', { timeline: 'friends' })
+ store.dispatch('startFetchingTimeline', { timeline: 'friends' })
+
+ // Start fetching notifications
+ store.dispatch('startFetchingNotifications')
// Get user mutes
store.dispatch('fetchMutes')