diff options
author | ThibG <thib@sitedethib.com> | 2019-03-20 17:29:12 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-20 17:29:12 +0100 |
commit | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (patch) | |
tree | af7a96def3f54cdb4b8fcb11adc1ecb36166c529 /app/javascript/mastodon/actions/importer/normalizer.js | |
parent | 66d945209278c9344d503fe4e7a58d5c6f040e50 (diff) |
Add support for custom emojis in poll options (#10322)
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
Diffstat (limited to 'app/javascript/mastodon/actions/importer/normalizer.js')
-rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index ea80c0efb..5badb0c49 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -71,9 +71,11 @@ export function normalizeStatus(status, normalOldStatus) { export function normalizePoll(poll) { const normalPoll = { ...poll }; + const emojiMap = makeEmojiMap(normalPoll); + normalPoll.options = poll.options.map(option => ({ ...option, - title_emojified: emojify(escapeTextContentForBrowser(option.title)), + title_emojified: emojify(escapeTextContentForBrowser(option.title), emojiMap), })); return normalPoll; |