diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-25 14:45:14 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-25 14:45:14 +0200 |
| commit | 47ef4a6c7a74072daff8b23c4af3e300bb75ba1a (patch) | |
| tree | afa97381a3bc8bd5e5c910d873dddc3fa3b2ff4e /app/javascript/mastodon/actions/importer | |
| parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) | |
Apply filters to poll options (#11174)
* Apply filters to poll options in WebUI Fixes #11128 * Apply filters to poll options server-side * Add poll options to searchable text
Diffstat (limited to 'app/javascript/mastodon/actions/importer')
| -rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index 5badb0c49..b250ee076 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -56,7 +56,7 @@ export function normalizeStatus(status, normalOldStatus) { normalStatus.hidden = normalOldStatus.get('hidden'); } else { const spoilerText = normalStatus.spoiler_text || ''; - const searchContent = [spoilerText, status.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); + const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); const emojiMap = makeEmojiMap(normalStatus); normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; |