Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set

master
Thibaut Girka 6 years ago committed by ThibG
parent 3d5a789bbb
commit c0275cdcb2
  1. 4
      app/javascript/flavours/glitch/features/composer/index.js

@ -485,8 +485,8 @@ class Composer extends React.Component {
onUpload={onUpload}
privacy={privacy}
resetFileKey={resetFileKey}
sensitive={sensitive}
spoiler={spoiler}
sensitive={sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0)}
spoiler={spoilersAlwaysOn ? (spoilerText && spoilerText.length > 0) : spoiler}
/>
<ComposerPublisher
countText={`${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁' : ''}`}

Loading…
Cancel
Save