From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 22 Sep 2019 22:48:43 +0000 (+0200)
Subject: Fix emoji search not showing custom emoji when none are uncategorized (#11920)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0d2b60ab8b13a28e99a83e1104e7208de2025304;p=mastodon.git

Fix emoji search not showing custom emoji when none are uncategorized (#11920)

Fix #11903
---

diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index 359bb7ffd..cd10e20b7 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -99,4 +99,4 @@ export const buildCustomEmojis = (customEmojis) => {
   return emojis;
 };
 
-export const categoriesFromEmojis = customEmojis => customEmojis.reduce((set, emoji) => set.add(emoji.get('category') ? `custom-${emoji.get('category')}` : 'custom'), new Set());
+export const categoriesFromEmojis = customEmojis => customEmojis.reduce((set, emoji) => set.add(emoji.get('category') ? `custom-${emoji.get('category')}` : 'custom'), new Set(['custom']));