slove-conflict

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main.js b/src/main.js
index 359dbf52..a6f7e69f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -138,7 +138,7 @@ window.fetch('/api/pleroma/emoji.json')
           const emoji = Object.keys(values).map((key) => {
             return { shortcode: key, image_url: values[key] }
           })
-          store.dispatch('setOption', { name: 'emoji', value: emoji })
+          store.dispatch('setOption', { name: 'customEmoji', value: emoji })
           store.dispatch('setOption', { name: 'pleromaBackend', value: true })
         },
         (failure) => {
@@ -148,9 +148,19 @@ window.fetch('/api/pleroma/emoji.json')
     (error) => console.log(error)
   )
 
+window.fetch('/static/emoji.json')
+  .then((res) => res.json())
+  .then((values) => {
+    const emoji = Object.keys(values).map((key) => {
+      return { shortcode: key, image_url: false, 'utf': values[key] }
+    })
+    store.dispatch('setOption', { name: 'emoji', value: emoji })
+  })
+
 window.fetch('/instance/panel.html')
   .then((res) => res.text())
   .then((html) => {
     store.dispatch('setOption', { name: 'instanceSpecificPanelContent', value: html })
   })
 
+