IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6885/PLT-6888 Fix custom emojis (#6694)

Browse Source 
* Fix custom emojis

* Fix custom emoji reactions
This commit is contained in:
Joram Wilander
2017-06-20 11:47:53 -04:00
committed by GitHub
parent 2e6fd031d1
commit 414b208100
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/actions/emoji_actions.jsx
View File

@@ -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');
}
);
}

4
webapp/components/post_view/post_message_view/index.js
View File

@@ -2,7 +2,7 @@
// See License.txt for license information.
import {connect} from 'react-redux';
import {getCustomEmojisAsMap} from 'mattermost-redux/selectors/entities/emojis';
import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
import {getBool} from 'mattermost-redux/selectors/entities/preferences';
import {getCurrentUserMentionKeys, getUsersByUsername} from 'mattermost-redux/selectors/entities/users';
@@ -20,7 +20,7 @@ function makeMapStateToProps() {
let oldCustomEmoji;
return function mapStateToProps(state, ownProps) {
const newCustomEmoji = getCustomEmojisAsMap(state);
const newCustomEmoji = getCustomEmojisByName(state);
if (newCustomEmoji !== oldCustomEmoji) {
emojiMap = new EmojiMap(newCustomEmoji);
}

2
webapp/components/post_view/reaction/index.js
View File

@@ -20,7 +20,7 @@ function makeMapStateToProps() {
if (Emoji.EmojiIndicesByAlias.has(ownProps.emojiName)) {
emoji = Emoji.Emojis[Emoji.EmojiIndicesByAlias.get(ownProps.emojiName)];
} else {
emoji = ownProps.emojis[ownProps.emojiName];
emoji = ownProps.emojis.get(ownProps.emojiName);
}
return {

4
webapp/components/post_view/reaction_list/index.js
View File

@@ -4,7 +4,7 @@
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts';
import {getCustomEmojisAsMap} from 'mattermost-redux/selectors/entities/emojis';
import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
import * as Actions from 'mattermost-redux/actions/posts';
@@ -17,7 +17,7 @@ function makeMapStateToProps() {
return {
...ownProps,
reactions: getReactionsForPost(state, ownProps.post.id),
emojis: getCustomEmojisAsMap(state)
emojis: getCustomEmojisByName(state)
};
};
}