Skip to content
Snippets Groups Projects
Commit fe269b2c authored by eal's avatar eal
Browse files

Merge branch 'fix/gs-emoji-error' into 'develop'

Suppress emoji fetch error on gs.

See merge request !183
parents 855f8b4f 1db1529d
No related branches found
No related tags found
1 merge request!183Suppress emoji fetch error on gs.
Pipeline #
...@@ -129,10 +129,16 @@ window.fetch('/static/terms-of-service.html') ...@@ -129,10 +129,16 @@ window.fetch('/static/terms-of-service.html')
}) })
window.fetch('/api/pleroma/emoji.json') window.fetch('/api/pleroma/emoji.json')
.then((res) => res.json()) .then(
.then((values) => { (res) => res.json()
const emoji = Object.keys(values).map((key) => { .then(
return { shortcode: key, image_url: values[key] } (values) => {
}) const emoji = Object.keys(values).map((key) => {
store.dispatch('setOption', { name: 'emoji', value: emoji }) return { shortcode: key, image_url: values[key] }
}) })
store.dispatch('setOption', { name: 'emoji', value: emoji })
},
(failure) => {}
),
(error) => console.log(error)
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment