Browse Source

Fix interactions between CW and sensitive flag when spoilersAlwaysOn is set

closed-social-glitch-2
Thibaut Girka 6 years ago
committed by ThibG
parent
commit
c0275cdcb2
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/javascript/flavours/glitch/features/composer/index.js

+ 2
- 2
app/javascript/flavours/glitch/features/composer/index.js View File

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

Loading…
Cancel
Save