pleroma-fe

commit: 25601c6873a17a9a91d1134f4a145b320e78fd7b
parent: d7cf841dfe6e434b27afed32ef2fcf214c5b6bc4
Author: Shpuld Shpludson <shp@cock.li>
Date:   Wed, 10 Apr 2019 03:14:51 +0000

Merge branch 'fix-emoji-picker' into 'develop'

support new custom emoji format

Closes #484

See merge request pleroma/pleroma-fe!746
Diffstat:
M
src/boot/after_store.js
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -171,9 +171,10 @@ const getCustomEmoji = async ({ store }) => {
   try {
     const res = await window.fetch('/api/pleroma/emoji.json')
     if (res.ok) {
-      const values = await res.json()
+      const result = await res.json()
+      const values = Array.isArray(result) ? Object.assign({}, ...result) : result
       const emoji = Object.keys(values).map((key) => {
-        return { shortcode: key, image_url: values[key] }
+        return { shortcode: key, image_url: values[key].image_url || values[key] }
       })
       store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
       store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })