toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render text for non-existent emoji when post metadata is enabled (#2423)

Browse source
This commit is contained in:
Saturnino Abril 2018-12-07 01:18:43 +08:00 committed by Harrison Healey
parent 507bb50ee1
commit 97b6eaecb1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/emoji/index.js
View file

@ -10,11 +10,11 @@ import {Client4} from 'mattermost-redux/client';
import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
import {EmojiIndicesByAlias, Emojis} from 'app/utils/emojis';
import {doesMatchNamedEmoji} from 'app/utils/emoji_utils';
import Emoji from './emoji';
function mapStateToProps(state, ownProps) {
const config = getConfig(state);
const emojiName = ownProps.emojiName;
const customEmojis = getCustomEmojisByName(state);
@ -30,8 +30,8 @@ function mapStateToProps(state, ownProps) {
isCustomEmoji = true;
} else {
displayTextOnly = state.entities.emojis.nonExistentEmoji.has(emojiName) ||
(doesMatchNamedEmoji(`:${emojiName}:`) && !customEmojis.has(emojiName)) ||
getConfig(state).EnableCustomEmoji !== 'true' ||
config.EnableCustomEmoji !== 'true' ||
config.ExperimentalEnablePostMetadata === 'true' ||
getCurrentUserId(state) === '' ||
!isMinimumServerVersion(Client4.getServerVersion(), 4, 7);
}