nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate frequently used emojis (#7064)

This commit is contained in:
Harmon 2018-04-07 07:53:11 -05:00 committed by Eugen Rochko
parent b08ab329f4
commit 98146281e1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
View File

@ -38,7 +38,8 @@ const getFrequentlyUsedEmojis = createSelector([
.toArray(); .toArray();
if (emojis.length < DEFAULTS.length) { if (emojis.length < DEFAULTS.length) {
emojis = emojis.concat(DEFAULTS.slice(0, DEFAULTS.length - emojis.length)); let uniqueDefaults = DEFAULTS.filter(emoji => !emojis.includes(emoji));
emojis = emojis.concat(uniqueDefaults.slice(0, DEFAULTS.length - emojis.length));
} }
return emojis; return emojis;