From c6ccacdf7ba0e8d4b99f9ed74c185a992808c421 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 19 Nov 2025 11:35:10 +0100 Subject: [PATCH] Fix quoting overwriting current content warning (#36934) --- app/javascript/mastodon/reducers/compose.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index d4ed1bd505..784050d942 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -341,8 +341,8 @@ export const composeReducer = (state = initialState, action) => { const isDirect = state.get('privacy') === 'direct'; return state .set('quoted_status_id', isDirect ? null : status.get('id')) - .set('spoiler', status.get('sensitive')) - .set('spoiler_text', status.get('spoiler_text')) + .update('spoiler', spoiler => (spoiler) || !!status.get('spoiler_text')) + .update('spoiler_text', (spoiler_text) => spoiler_text || status.get('spoiler_text')) .update('privacy', (visibility) => { if (['public', 'unlisted'].includes(visibility) && status.get('visibility') === 'private') { return 'private';