diff --git a/app/javascript/flavours/glitch/actions/importer/index.js b/app/javascript/flavours/glitch/actions/importer/index.js
index abadee8173f..e990dc04cb6 100644
--- a/app/javascript/flavours/glitch/actions/importer/index.js
+++ b/app/javascript/flavours/glitch/actions/importer/index.js
@@ -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));
}
}
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index f57fb70b4e1..ccd84364e83 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -65,3 +65,14 @@ export function normalizeStatus(status, normalOldStatus) {
return normalStatus;
}
+
+export function normalizePoll(poll) {
+ const normalPoll = { ...poll };
+
+ normalPoll.options = poll.options.map(option => ({
+ ...option,
+ title_emojified: emojify(escapeTextContentForBrowser(option.title)),
+ }));
+
+ return normalPoll;
+}
diff --git a/app/javascript/flavours/glitch/components/poll.js b/app/javascript/flavours/glitch/components/poll.js
index 182491af865..c52445c86f0 100644
--- a/app/javascript/flavours/glitch/components/poll.js
+++ b/app/javascript/flavours/glitch/components/poll.js
@@ -120,7 +120,7 @@ class Poll extends ImmutablePureComponent {
{!showResults && }
{showResults && {Math.round(percent)}%}
- {option.get('title')}
+
);