Merge branch 'fix/chat-issues' into 'develop'

Initialize chat only if user is logged in and it wasn't initialized before

Closes pleroma#1067, pleroma#856, pleroma#1080, and #394

See merge request pleroma/pleroma-fe!894

src/boot/after_store.js

@@ -109,12 +109,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('noAttachmentLinks')
   copyInstanceOption('showFeaturesPanel')
 
-  if ((config.chatDisabled)) {
-    store.dispatch('disableChat')
-  } else {
-    store.dispatch('initializeSocket')
-  }
-
   return store.dispatch('setTheme', config['theme'])
 }
 

src/components/features_panel/features_panel.js

@@ -1,8 +1,6 @@
 const FeaturesPanel = {
   computed: {
-    chat: function () {
+    chat: function () { return this.$store.state.instance.chatAvailable },
-      return this.$store.state.instance.chatAvailable && (!this.$store.state.chatDisabled)
-    },
     gopher: function () { return this.$store.state.instance.gopherAvailable },
     whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
     mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },

src/modules/api.js

@@ -6,7 +6,6 @@ const api = {
     backendInteractor: backendInteractorService(),
     fetchers: {},
     socket: null,
-    chatDisabled: false,
     followRequests: []
   },
   mutations: {
@@ -25,9 +24,6 @@ const api = {
     setSocket (state, socket) {
       state.socket = socket
     },
-    setChatDisabled (state, value) {
-      state.chatDisabled = value
-    },
     setFollowRequests (state, value) {
       state.followRequests = value
     }
@@ -55,17 +51,20 @@ const api = {
     setWsToken (store, token) {
       store.commit('setWsToken', token)
     },
-    initializeSocket (store) {
+    initializeSocket ({ dispatch, commit, state, rootState }) {
       // Set up websocket connection
-      if (!store.state.chatDisabled) {
+      const token = state.wsToken
-        const token = store.state.wsToken
+      if (rootState.instance.chatAvailable && typeof token !== 'undefined' && state.socket === null) {
         const socket = new Socket('/socket', { params: { token } })
         socket.connect()
-        store.dispatch('initializeChat', socket)
+
+        commit('setSocket', socket)
+        dispatch('initializeChat', socket)
       }
     },
-    disableChat (store) {
+    disconnectFromSocket ({ commit, state }) {
-      store.commit('setChatDisabled', true)
+      state.socket && state.socket.disconnect()
+      commit('setSocket', null)
     },
     removeFollowRequest (store, request) {
       let requests = store.state.followRequests.filter((it) => it !== request)

src/modules/chat.js

@@ -1,16 +1,12 @@
 const chat = {
   state: {
     messages: [],
-    channel: { state: '' },
+    channel: { state: '' }
-    socket: null
   },
   mutations: {
     setChannel (state, channel) {
       state.channel = channel
     },
-    setSocket (state, socket) {
-      state.socket = socket
-    },
     addMessage (state, message) {
       state.messages.push(message)
       state.messages = state.messages.slice(-19, 20)
@@ -20,12 +16,8 @@ const chat = {
     }
   },
   actions: {
-    disconnectFromChat (store) {
-      store.state.socket && store.state.socket.disconnect()
-    },
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
-      store.commit('setSocket', socket)
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })

src/modules/instance.js

@@ -79,6 +79,11 @@ const instance = {
         case 'name':
           dispatch('setPageTitle')
           break
+        case 'chatAvailable':
+          if (value) {
+            dispatch('initializeSocket')
+          }
+          break
       }
     },
     setTheme ({ commit }, themeName) {

src/modules/users.js

@@ -410,7 +410,7 @@ const users = {
         })
         .then(() => {
           store.commit('clearCurrentUser')
-          store.dispatch('disconnectFromChat')
+          store.dispatch('disconnectFromSocket')
           store.commit('clearToken')
           store.dispatch('stopFetching', 'friends')
           store.commit('setBackendInteractor', backendInteractorService(store.getters.getToken()))

static/config.json

@@ -6,7 +6,6 @@
   "logoMargin": ".1em",
   "redirectRootNoLogin": "/main/all",
   "redirectRootLogin": "/main/friends",
-  "chatDisabled": false,
   "showInstanceSpecificPanel": false,
   "collapseMessageWithSubject": false,
   "scopeCopy": true,