tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Render unicode emoji in polls using emoji pack (#10185)

Browse Source
This commit is contained in:
Eugen Rochko
2019-03-06 03:57:46 +01:00
committed by GitHub
parent efd0fb8088
commit 4407f07014
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/actions/importer/index.js
View File

@ -1,4 +1,4 @@
import { normalizeAccount, normalizeStatus } from './normalizer';
import { normalizeAccount, normalizeStatus, normalizePoll } from './normalizer';
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
@ -71,7 +71,7 @@ export function importFetchedStatuses(statuses) {
}
if (status.poll && status.poll.id) {
pushUnique(polls, status.poll);
pushUnique(polls, normalizePoll(status.poll));
}
}