logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: bd6c446b3349aea3e931ee75b0cef748b95d40c6
parent: 0e5fe7504f26bdef2a95384268c85bb14a2cdb40
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 29 Jan 2019 15:57:36 +0000

Merge branch 'fix/dont-connect-ws-when-chat-disabled' into 'develop'

fix #288 - Don't connect WS when chat is disabled

Closes #288

See merge request pleroma/pleroma-fe!492

Diffstat:

Msrc/boot/after_store.js2++
Msrc/modules/api.js11+++++++++--
Msrc/modules/users.js4++--
3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js @@ -89,6 +89,8 @@ const afterStoreSetup = ({ store, i18n }) => { if ((config.chatDisabled)) { store.dispatch('disableChat') + } else { + store.dispatch('initializeSocket') } const router = new VueRouter({ diff --git a/src/modules/api.js b/src/modules/api.js @@ -20,6 +20,9 @@ const api = { removeFetcher (state, {timeline}) { delete state.fetchers[timeline] }, + setWsToken (state, token) { + state.wsToken = token + }, setSocket (state, socket) { state.socket = socket }, @@ -51,10 +54,14 @@ const api = { window.clearInterval(fetcher) store.commit('removeFetcher', {timeline}) }, - initializeSocket (store, token) { + setWsToken (store, token) { + store.commit('setWsToken', token) + }, + initializeSocket (store) { // Set up websocket connection if (!store.state.chatDisabled) { - let socket = new Socket('/socket', {params: {token: token}}) + const token = store.state.wsToken + const socket = new Socket('/socket', {params: {token}}) socket.connect() store.dispatch('initializeChat', socket) } diff --git a/src/modules/users.js b/src/modules/users.js @@ -224,10 +224,10 @@ const users = { commit('setBackendInteractor', backendInteractorService(accessToken)) if (user.token) { - store.dispatch('initializeSocket', user.token) + store.dispatch('setWsToken', user.token) } - // Start getting fresh tweets. + // Start getting fresh posts. store.dispatch('startFetching', 'friends') // Get user mutes and follower info