Merge branch 'develop' into 'master'

Update master with bugfixes (and other changes)

See merge request pleroma/pleroma-fe!673

1 files changed, 6 insertions, 0 deletions

diff --git a/src/modules/users.js b/src/modules/users.js
index 093af497..26884750 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -292,9 +292,12 @@ const users = {
 
     logout (store) {
       store.commit('clearCurrentUser')
+      store.dispatch('disconnectFromChat')
       store.commit('setToken', false)
       store.dispatch('stopFetching', 'friends')
       store.commit('setBackendInteractor', backendInteractorService())
+      store.dispatch('stopFetchingNotifications')
+      store.commit('resetStatuses')
     },
     loginUser (store, accessToken) {
       return new Promise((resolve, reject) => {
@@ -319,6 +322,9 @@ const users = {
 
               if (user.token) {
                 store.dispatch('setWsToken', user.token)
+
+                // Initialize the chat socket.
+                store.dispatch('initializeSocket')
               }
 
               // Start getting fresh posts.