autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When processing custom emoji, ensure a non-animated version exists (#5230)

Browse Source 
Use the non-animated version in web UI, but return both in API
This commit is contained in:
Eugen Rochko
2017-10-05 23:41:47 +02:00
committed by GitHub
parent 2559d9166c
commit b9c76e2edb
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/emoji.js
View File

@ -52,7 +52,7 @@ export const buildCustomEmojis = customEmojis => {
customEmojis.forEach(emoji => {
const shortcode = emoji.get('shortcode');
const url = emoji.get('url');
const url = emoji.get('static_url');
const name = shortcode.replace(':', '');
emojis.push({

2
app/javascript/mastodon/reducers/statuses.js
View File

@ -60,7 +60,7 @@ const normalizeStatus = (state, status) => {
const searchContent = [status.spoiler_text, status.content].join(' ').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
obj[`:${emoji.shortcode}:`] = emoji.url;
obj[`:${emoji.shortcode}:`] = emoji.static_url;
return obj;
}, {});