Compare commits

...

1 Commits

Author SHA1 Message Date
Henry Jameson c651d48a8c use mastoapi emoji endpoint since it's already sorted, should speed things up on
instances with tons of emoji
2019-09-26 21:38:03 +03:00
1 changed files with 8 additions and 10 deletions

View File

@ -199,20 +199,18 @@ const getStaticEmoji = async ({ store }) => {
// Somewhat weird, should probably be somewhere else. // Somewhat weird, should probably be somewhere else.
const getCustomEmoji = async ({ store }) => { const getCustomEmoji = async ({ store }) => {
try { try {
const res = await window.fetch('/api/pleroma/emoji.json') const res = await window.fetch('/api/v1/custom_emojis')
if (res.ok) { if (res.ok) {
const result = await res.json() const result = await res.json()
const values = Array.isArray(result) ? Object.assign({}, ...result) : result const emoji = result.map(({ url, shortcode, tags, category }) => {
const emoji = Object.entries(values).map(([key, value]) => {
const imageUrl = value.image_url
return { return {
displayText: key, displayText: shortcode,
imageUrl: imageUrl ? store.state.instance.server + imageUrl : value, imageUrl: url,
tags: imageUrl ? value.tags.sort((a, b) => a > b ? 1 : 0) : ['utf'], tags,
replacement: `:${key}: ` category,
replacement: `:${shortcode}: `
} }
// Technically could use tags but those are kinda useless right now, should have been "pack" field, that would be more useful })
}).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0)
store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji }) store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true }) store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
} else { } else {