]> cat aescling's git repositories - mastodon.git/commitdiff
Remove duplicate frequently used emojis (#7064)
authorHarmon <Harmon758@gmail.com>
Sat, 7 Apr 2018 12:53:11 +0000 (07:53 -0500)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 7 Apr 2018 12:53:11 +0000 (14:53 +0200)
app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js

index e6a535a5dcd4d3246aae91f83ef4118f6c0e30bb..5ec937a393ce70f10d8b5e131b27cd61ad37759e 100644 (file)
@@ -38,7 +38,8 @@ const getFrequentlyUsedEmojis = createSelector([
     .toArray();
 
   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;