From: Harmon <Harmon758@gmail.com>
Date: Sat, 7 Apr 2018 12:53:11 +0000 (-0500)
Subject: Remove duplicate frequently used emojis (#7064)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=98146281e1beaf994710b13ef70f6224e8588cba;p=mastodon.git

Remove duplicate frequently used emojis (#7064)
---

diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index e6a535a5d..5ec937a39 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -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;