~cytrogen/masto-fe: When sending a toot, ensure a CW is only set if the CW field is visible (#11206)

ccc7fe3e1d04c7cabad916e4e57c7739743d5c91 — ThibG 6 years ago 84ff393

When sending a toot, ensure a CW is only set if the CW field is visible (#11206)

In some occasions, such as the browser or a browser extension auto-filling
the existing but disabled/hidden CW field, a CW can be set without the user
knowing.

patch browse .tar.gz

2 files changed, 2 insertions(+), 1 deletions(-)

M app/javascript/mastodon/actions/compose.js
M app/javascript/mastodon/reducers/compose.js

M app/javascript/mastodon/actions/compose.js => app/javascript/mastodon/actions/compose.js +1 -1

@@ 139,7 139,7 @@ export function submitCompose(routerHistory) {
       in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
       media_ids: media.map(item => item.get('id')),
       sensitive: getState().getIn(['compose', 'sensitive']),
-      spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
+      spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
       visibility: getState().getIn(['compose', 'privacy']),
       poll: getState().getIn(['compose', 'poll'], null),
     }, {

M app/javascript/mastodon/reducers/compose.js => app/javascript/mastodon/reducers/compose.js +1 -0

@@ 224,6 224,7 @@ export default function compose(state = initialState, action) {
       }
     });
   case COMPOSE_SPOILER_TEXT_CHANGE:
+    if (!state.get('spoiler')) return state;
     return state
       .set('spoiler_text', action.text)
       .set('idempotencyKey', uuid());