From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 30 Jun 2019 09:09:54 +0000 (+0200)
Subject: [Glitch] When sending a toot, ensure a CW is only set if the CW field is visible
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b6e9b7d1cdaf762964b0920cfb0485d30cff834c;p=mastodon.git

[Glitch] When sending a toot, ensure a CW is only set if the CW field is visible

Partial port of ccc7fe3e1d04c7cabad916e4e57c7739743d5c91 to glitch-soc

It doesn't ensure the field isn't changed, just that it isn't submitted if
the field isn't visible. Ensuring the field isn't changed would require
reworking the “always show CW field” feature.
---

diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js
index 69cc6827f..2312bae63 100644
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@@ -138,7 +138,8 @@ export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
     let status = getState().getIn(['compose', 'text'], '');
     let media  = getState().getIn(['compose', 'media_attachments']);
-    let spoilerText = getState().getIn(['compose', 'spoiler_text'], '');
+    const spoilers = getState().getIn(['compose', 'spoiler']) || getState().getIn(['local_settings', 'always_show_spoilers_field']);
+    let spoilerText = spoilers ? getState().getIn(['compose', 'spoiler_text'], '') : '';
 
     if ((!status || !status.length) && media.size === 0) {
       return;