diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-28 22:35:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 22:35:54 +0200 |
| commit | 98c2d2aa46c2725b360907cf5537338ac6d052ed (patch) | |
| tree | 4b3301453fc3f8bcfe412a5e1bb967ec5c3414c6 /app/javascript/flavours/glitch/util/emoji/index.js | |
| parent | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (diff) | |
| parent | 662252c8f77e8dd8fd015bc6ece0943f068b1710 (diff) | |
Merge pull request #1146 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/util/emoji/index.js')
| -rw-r--r-- | app/javascript/flavours/glitch/util/emoji/index.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/util/emoji/index.js b/app/javascript/flavours/glitch/util/emoji/index.js index 82a1ef89c..e6fcaf0dc 100644 --- a/app/javascript/flavours/glitch/util/emoji/index.js +++ b/app/javascript/flavours/glitch/util/emoji/index.js @@ -93,8 +93,11 @@ export const buildCustomEmojis = (customEmojis) => { keywords: [name], imageUrl: url, custom: true, + customCategory: emoji.get('category'), }); }); return emojis; }; + +export const categoriesFromEmojis = customEmojis => customEmojis.reduce((set, emoji) => set.add(emoji.get('category') ? `custom-${emoji.get('category')}` : 'custom'), new Set()); |