summaryrefslogtreecommitdiffstats
path: root/webapp/actions/websocket_actions.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/actions/websocket_actions.jsx')
-rw-r--r--webapp/actions/websocket_actions.jsx7
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 1cdd06599..72be226cc 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -31,6 +31,7 @@ const getState = store.getState;
import {batchActions} from 'redux-batched-actions';
import {Client4} from 'mattermost-redux/client';
+import {getSiteURL} from 'utils/url.jsx';
import * as TeamActions from 'mattermost-redux/actions/teams';
import {viewChannel, getChannelAndMyMember, getChannelStats} from 'mattermost-redux/actions/channels';
@@ -46,7 +47,7 @@ export function initialize() {
return;
}
- let connUrl = Client4.getWebSocketUrl();
+ let connUrl = getSiteURL();
// replace the protocol with a websocket one
if (connUrl.startsWith('https:')) {
@@ -56,7 +57,7 @@ export function initialize() {
}
// append a port number if one isn't already specified
- if (!(/:\d+/).test(connUrl)) {
+ if (!(/:\d+$/).test(connUrl)) {
if (connUrl.startsWith('wss:')) {
connUrl += ':' + global.window.mm_config.WebsocketSecurePort;
} else {
@@ -64,6 +65,8 @@ export function initialize() {
}
}
+ connUrl += Client4.getUrlVersion() + '/websocket';
+
WebSocketClient.setEventCallback(handleEvent);
WebSocketClient.setFirstConnectCallback(handleFirstConnect);
WebSocketClient.setReconnectCallback(() => reconnect(false));