summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-09-04 19:45:35 -0400
committerenahum <nahumhbl@gmail.com>2016-09-04 20:45:34 -0300
commit9d11dd437faf294a735f52f35e90779353f35293 (patch)
treeb9503961a30b4a100a32b8c0645748676eea337e /webapp
parent6c085594e47eeabbe5084a0e5c231af3e18527b6 (diff)
downloadchat-9d11dd437faf294a735f52f35e90779353f35293.tar.gz
chat-9d11dd437faf294a735f52f35e90779353f35293.tar.bz2
chat-9d11dd437faf294a735f52f35e90779353f35293.zip
Send hello event containing server version on WebSocket connect (#3936)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/websocket_actions.jsx9
-rw-r--r--webapp/utils/constants.jsx3
2 files changed, 11 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 28faf4733..68853c229 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -156,6 +156,10 @@ function handleEvent(msg) {
handleStatusChangedEvent(msg);
break;
+ case SocketEvents.HELLO:
+ handleHelloEvent(msg);
+ break;
+
default:
}
}
@@ -284,3 +288,8 @@ function handleUserTypingEvent(msg) {
function handleStatusChangedEvent(msg) {
UserStore.setStatus(msg.user_id, msg.data.status);
}
+
+function handleHelloEvent(msg) {
+ Client.serverVersion = msg.data.server_version;
+ AsyncClient.checkVersion();
+}
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 1ec20d3e8..b4eb1d11a 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -198,7 +198,8 @@ export const Constants = {
TYPING: 'typing',
PREFERENCE_CHANGED: 'preference_changed',
EPHEMERAL_MESSAGE: 'ephemeral_message',
- STATUS_CHANGED: 'status_change'
+ STATUS_CHANGED: 'status_change',
+ HELLO: 'hello'
},
UserUpdateEvents: {