diff options
| author | VeraLyu <lvroyce0210@gmail.com> | 2017-06-24 07:09:17 +0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-23 19:09:17 -0400 |
| commit | 33eb77b757a2e5560145024ac8f491a15a8a4e8f (patch) | |
| tree | fb2749aa98a955409b67aca452869e613d7b7bb2 /webapp | |
| parent | 4df36a504cebc61fa1e5e6f7980f9245b475facf (diff) | |
| download | chat-33eb77b757a2e5560145024ac8f491a15a8a4e8f.tar.gz chat-33eb77b757a2e5560145024ac8f491a15a8a4e8f.tar.bz2 chat-33eb77b757a2e5560145024ac8f491a15a8a4e8f.zip | |
PLT-3711: Add websocket event for emoji addition (#6211)
* PLT-3711: Add websocket event for emoji addition
* (SA) updated as per review
This PR is edited directly to merge into master.
* (SA) updated as per review
This PR is edited directly to merge into master.
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 13 | ||||
| -rw-r--r-- | webapp/utils/constants.jsx | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index db301d539..bf9b05cb7 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -230,6 +230,10 @@ function handleEvent(msg) { handleReactionRemovedEvent(msg); break; + case SocketEvents.EMOJI_ADDED: + handleAddEmoji(msg); + break; + default: } } @@ -438,6 +442,15 @@ function handleReactionAddedEvent(msg) { }); } +function handleAddEmoji(msg) { + const data = JSON.parse(msg.data.emoji); + + AppDispatcher.handleServerAction({ + type: ActionTypes.RECEIVED_CUSTOM_EMOJI, + emoji: data + }); +} + function handleReactionRemovedEvent(msg) { const reaction = JSON.parse(msg.data.reaction); diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 11fe77613..1d49d1cae 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -242,7 +242,8 @@ export const SocketEvents = { HELLO: 'hello', WEBRTC: 'webrtc', REACTION_ADDED: 'reaction_added', - REACTION_REMOVED: 'reaction_removed' + REACTION_REMOVED: 'reaction_removed', + EMOJI_ADDED: 'emoji_added' }; export const TutorialSteps = { |