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

Fix being unable to unmark media as sensitive when "always mark media as sensitive" is enabled (#39339)

Browse Source
This commit is contained in:
matrix07012 2026-06-10 11:27:38 +02:00 committed by GitHub
parent c51eb56a90
commit f2094164c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/compose_form.jsx
View File

@ -220,7 +220,9 @@ class ComposeForm extends ImmutablePureComponent {
} else if(prevProps.isSubmitting && !this.props.isSubmitting) {
this.textareaRef.current.focus();
} else if (this.props.spoiler !== prevProps.spoiler) {
if (this.props.spoiler) {
const mediaJustAdded = this.props.anyMedia && !prevProps.anyMedia;
if (this.props.spoiler && !mediaJustAdded) {
this.spoilerText.input.focus();
} else if (prevProps.spoiler) {
this.textareaRef.current.focus();

10
app/javascript/mastodon/reducers/compose.js
View File

@ -155,6 +155,10 @@ function appendMedia(state, media, file) {
if (prevSize === 0 && (state.get('default_sensitive') || state.get('spoiler'))) {
map.set('sensitive', true);
if (state.get('default_sensitive')) {
map.set('spoiler', true);
}
}
});
}
@ -400,7 +404,7 @@ export const composeReducer = (state = initialState, action) => {
map.set('spoiler', !state.get('spoiler'));
map.set('idempotencyKey', uuid());
if (state.get('media_attachments').size >= 1 && !state.get('default_sensitive')) {
if (state.get('media_attachments').size >= 1) {
map.set('sensitive', !state.get('spoiler'));
}
});
@ -545,7 +549,7 @@ export const composeReducer = (state = initialState, action) => {
map.set('spoiler', true);
map.set('spoiler_text', action.status.get('spoiler_text'));
} else {
map.set('spoiler', false);
map.set('spoiler', action.status.get('sensitive') && action.status.get('media_attachments').size > 0);
map.set('spoiler_text', '');
}
@ -582,7 +586,7 @@ export const composeReducer = (state = initialState, action) => {
map.set('spoiler', true);
map.set('spoiler_text', action.spoiler_text);
} else {
map.set('spoiler', false);
map.set('spoiler', action.status.get('sensitive') && action.status.get('media_attachments').size > 0);
map.set('spoiler_text', '');
}