diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-20 11:47:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-20 11:47:53 -0400 |
commit | 414b208100a36975d2fa238f4adfb33b20212122 (patch) | |
tree | c5821a854ed97d003808b2104781cf35ea48e498 /webapp/actions | |
parent | 2e6fd031d15a9502e7a7a4536febfe49780c0697 (diff) | |
download | chat-414b208100a36975d2fa238f4adfb33b20212122.tar.gz chat-414b208100a36975d2fa238f4adfb33b20212122.tar.bz2 chat-414b208100a36975d2fa238f4adfb33b20212122.zip |
PLT-6885/PLT-6888 Fix custom emojis (#6694)
* Fix custom emojis
* Fix custom emoji reactions
Diffstat (limited to 'webapp/actions')
-rw-r--r-- | webapp/actions/emoji_actions.jsx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/webapp/actions/emoji_actions.jsx b/webapp/actions/emoji_actions.jsx index ed8bc84f7..e5c9751c0 100644 --- a/webapp/actions/emoji_actions.jsx +++ b/webapp/actions/emoji_actions.jsx @@ -1,35 +1,20 @@ // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; - import UserStore from 'stores/user_store.jsx'; -import * as AsyncClient from 'utils/async_client.jsx'; -import Client from 'client/web_client.jsx'; - -import {ActionTypes} from 'utils/constants.jsx'; - -// Redux actions import store from 'stores/redux_store.jsx'; const dispatch = store.dispatch; const getState = store.getState; import {getProfilesByIds} from 'mattermost-redux/actions/users'; +import {getAllCustomEmojis} from 'mattermost-redux/actions/emojis'; export function loadEmoji(getProfiles = true) { - Client.listEmoji( + getAllCustomEmojis(10000)(dispatch, getState).then( (data) => { - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_CUSTOM_EMOJIS, - emojis: data - }); - if (getProfiles) { loadProfilesForEmoji(data); } - }, - (err) => { - AsyncClient.dispatchError(err, 'listEmoji'); } ); } |