diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-12 11:03:05 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-12 11:03:05 +0200 |
| commit | dc58d02192baef0bd006d80f10f018f01dc5ff0f (patch) | |
| tree | ae1e316aa745d8c28551bf418ad6d47bc83c55a4 /app/javascript/mastodon/actions | |
| parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
| parent | 70f6f2e9b70afe5af17ee9aaec777565bdef8aed (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/actions')
| -rw-r--r-- | app/javascript/mastodon/actions/boosts.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/actions/importer/normalizer.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/boosts.js b/app/javascript/mastodon/actions/boosts.js index 6e14065d6..c0f0f3acc 100644 --- a/app/javascript/mastodon/actions/boosts.js +++ b/app/javascript/mastodon/actions/boosts.js @@ -11,7 +11,7 @@ export function initBoostModal(props) { dispatch({ type: BOOSTS_INIT_MODAL, - privacy + privacy, }); dispatch(openModal('BOOST', props)); 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 |