diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-30 13:55:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-30 13:55:49 -0500 |
commit | 165ad0d4f791f8ae2109472d8a626d911fa368e0 (patch) | |
tree | 29001baf676d7d4ef4cd9462e9f2c6766ed6333a /webapp/actions | |
parent | 2bf0342d130b3a77c5ed02e98e0857f28a5787f0 (diff) | |
download | chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.gz chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.tar.bz2 chat-165ad0d4f791f8ae2109472d8a626d911fa368e0.zip |
PLT-1378 Initial version of emoji reactions (#4520)
* Refactored emoji.json to support multiple aliases and emoji categories
* Added custom category to emoji.jsx and stabilized all fields
* Removed conflicting aliases for :mattermost: and :ca:
* fixup after store changes
* Added emoji reactions
* Removed reactions for an emoji when that emoji is deleted
* Fixed incorrect test case
* Renamed ReactionList to ReactionListView
* Fixed :+1: and :-1: not showing up as possible reactions
* Removed text emoticons from emoji reaction autocomplete
* Changed emoji reactions to be sorted by the order that they were first created
* Set a maximum number of listeners for the ReactionStore
* Removed unused code from Textbox component
* Fixed reaction permissions
* Changed error code when trying to modify reactions for another user
* Fixed merge conflicts
* Properly applied theme colours to reactions
* Fixed ESLint and gofmt errors
* Fixed ReactionListContainer to properly update when its post prop changes
* Removed unnecessary escape characters from reaction regexes
* Shared reaction message pattern between CreatePost and CreateComment
* Removed an unnecessary select query when saving a reaction
* Changed reactions route to be under /reactions
* Fixed copyright dates on newly added files
* Removed debug code that prevented all unit tests from being ran
* Cleaned up unnecessary code for reactions
* Renamed ReactionStore.List to ReactionStore.GetForPost
Diffstat (limited to 'webapp/actions')
-rw-r--r-- | webapp/actions/post_actions.jsx | 20 | ||||
-rw-r--r-- | webapp/actions/websocket_actions.jsx | 31 |
2 files changed, 50 insertions, 1 deletions
diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx index 9599a9a77..4f861c909 100644 --- a/webapp/actions/post_actions.jsx +++ b/webapp/actions/post_actions.jsx @@ -252,3 +252,23 @@ export function loadProfilesForPosts(posts) { AsyncClient.getProfilesByIds(list); } + +export function addReaction(channelId, postId, emojiName) { + const reaction = { + post_id: postId, + user_id: UserStore.getCurrentId(), + emoji_name: emojiName + }; + + AsyncClient.saveReaction(channelId, reaction); +} + +export function removeReaction(channelId, postId, emojiName) { + const reaction = { + post_id: postId, + user_id: UserStore.getCurrentId(), + emoji_name: emojiName + }; + + AsyncClient.deleteReaction(channelId, reaction); +} diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index d6adb5105..ec433aab5 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -11,6 +11,7 @@ import BrowserStore from 'stores/browser_store.jsx'; import ErrorStore from 'stores/error_store.jsx'; import NotificationStore from 'stores/notification_store.jsx'; //eslint-disable-line no-unused-vars +import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import Client from 'client/web_client.jsx'; import WebSocketClient from 'client/web_websocket_client.jsx'; import * as WebrtcActions from './webrtc_actions.jsx'; @@ -23,7 +24,7 @@ import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx'; import {loadChannelsForCurrentUser} from 'actions/channel_actions.jsx'; import * as StatusActions from 'actions/status_actions.jsx'; -import {Constants, SocketEvents, UserStatuses} from 'utils/constants.jsx'; +import {ActionTypes, Constants, SocketEvents, UserStatuses} from 'utils/constants.jsx'; import {browserHistory} from 'react-router/es6'; @@ -165,6 +166,14 @@ function handleEvent(msg) { handleWebrtc(msg); break; + case SocketEvents.REACTION_ADDED: + handleReactionAddedEvent(msg); + break; + + case SocketEvents.REACTION_REMOVED: + handleReactionRemovedEvent(msg); + break; + default: } } @@ -320,3 +329,23 @@ function handleWebrtc(msg) { const data = msg.data; return WebrtcActions.handle(data); } + +function handleReactionAddedEvent(msg) { + const reaction = JSON.parse(msg.data.reaction); + + AppDispatcher.handleServerAction({ + type: ActionTypes.ADDED_REACTION, + postId: reaction.post_id, + reaction + }); +} + +function handleReactionRemovedEvent(msg) { + const reaction = JSON.parse(msg.data.reaction); + + AppDispatcher.handleServerAction({ + type: ActionTypes.REMOVED_REACTION, + postId: reaction.post_id, + reaction + }); +} |