about summary refs log tree commit diff
path: root/app/javascript/mastodon/actions
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-11 22:21:47 +0200
committerGitHub <noreply@github.com>2021-05-11 22:21:47 +0200
commit70f6f2e9b70afe5af17ee9aaec777565bdef8aed (patch)
tree53cde500c1aca1d1474826b4794885376ef3dc6d /app/javascript/mastodon/actions
parent4f747d9f8355f5b226ae29b8d63bd83e3886db58 (diff)
Fix empty CW when a content-less toot with a CW is encountered twice (#16220)
Diffstat (limited to 'app/javascript/mastodon/actions')
-rw-r--r--app/javascript/mastodon/actions/importer/normalizer.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index abd5681d4..5002292b9 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -60,6 +60,7 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.search_index = normalOldStatus.get('search_index');
     normalStatus.contentHtml = normalOldStatus.get('contentHtml');
     normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
+    normalStatus.spoiler_text = normalOldStatus.get('spoiler_text');
     normalStatus.hidden = normalOldStatus.get('hidden');
   } else {
     // If the status has a CW but no contents, treat the CW as if it were the