diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-03 22:18:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 22:18:23 +0100 |
| commit | 230a012f0090c496fc5cdb011bcc8ed732fd0f5c (patch) | |
| tree | ca589b040b2d5c440e75e53d528f908cafe65d3a /app/javascript/mastodon/actions/importer/normalizer.js | |
| parent | 99dc212ae5d7b2527d835744bf903293398ce946 (diff) | |
Add polls (#10111)
* Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media
Diffstat (limited to 'app/javascript/mastodon/actions/importer/normalizer.js')
| -rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index 34a4150fa..3085cd537 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -43,6 +43,10 @@ export function normalizeStatus(status, normalOldStatus) { normalStatus.reblog = status.reblog.id; } + if (status.poll && status.poll.id) { + normalStatus.poll = status.poll.id; + } + // Only calculate these values when status first encountered // Otherwise keep the ones already in the reducer if (normalOldStatus) { |