tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2021-05-12 11:03:05 +02:00
parent ffc3f8eebe 70f6f2e9b7
commit dc58d02192
23 changed files with 135 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/boosts.js
View File

@@ -11,7 +11,7 @@ export function initBoostModal(props) {
dispatch({
type: BOOSTS_INIT_MODAL,
privacy
privacy,
});
dispatch(openModal('BOOST', props));

1
app/javascript/mastodon/actions/importer/normalizer.js
View File

@@ -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