[feature] Always show spoiler / content-warning box

app/javascript/flavours/glitch/features/compose/components/compose_form.jsx

@@ -34,7 +34,7 @@ const messages = defineMessages({
     id: 'confirmations.missing_media_description.confirm',
     defaultMessage: 'Send anyway',
   },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: '(Optional) post title / content warning' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -79,7 +79,6 @@ class ComposeForm extends ImmutablePureComponent {
     spoilersAlwaysOn: PropTypes.bool,
     mediaDescriptionConfirmation: PropTypes.bool,
     preselectOnReply: PropTypes.bool,
-    onChangeSpoilerness: PropTypes.func,
     onChangeVisibility: PropTypes.func,
     onMediaDescriptionConfirm: PropTypes.func,
   };
@@ -292,7 +291,6 @@ class ComposeForm extends ImmutablePureComponent {
       intl,
       isSubmitting,
       layout,
-      onChangeSpoilerness,
       onClearSuggestions,
       onFetchSuggestions,
       onPaste,
@@ -300,10 +298,8 @@ class ComposeForm extends ImmutablePureComponent {
       sensitive,
       showSearch,
       sideArm,
-      spoiler,
       spoilerText,
       suggestions,
-      spoilersAlwaysOn,
       isEditing,
     } = this.props;
 
@@ -315,13 +311,12 @@ class ComposeForm extends ImmutablePureComponent {
 
         <ReplyIndicatorContainer />
 
-        <div className={`spoiler-input ${spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef} aria-hidden={!this.props.spoiler}>
+        <div className={'spoiler-input spoiler-input--visible'} ref={this.setRef}>
           <AutosuggestInput
             placeholder={intl.formatMessage(messages.spoiler_placeholder)}
             value={spoilerText}
             onChange={this.handleChangeSpoiler}
             onKeyDown={this.handleKeyDown}
-            disabled={!spoiler}
             ref={this.handleRefSpoilerText}
             suggestions={suggestions}
             onSuggestionsFetchRequested={onFetchSuggestions}
@@ -364,11 +359,9 @@ class ComposeForm extends ImmutablePureComponent {
           <OptionsContainer
             advancedOptions={advancedOptions}
             disabled={isSubmitting}
-            onToggleSpoiler={spoilersAlwaysOn ? null : onChangeSpoilerness}
             onUpload={onPaste}
             isEditing={isEditing}
-            sensitive={sensitive || (spoilersAlwaysOn && spoilerText && spoilerText.length > 0)}
-            spoiler={spoilersAlwaysOn ? (spoilerText && spoilerText.length > 0) : spoiler}
+            sensitive={sensitive || (spoilerText && spoilerText.length > 0)}
           />
           <div className='character-counter__wrapper'>
             <CharacterCounter text={countText} max={maxChars} />

app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js

@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import {
   changeCompose,
   changeComposeSpoilerText,
-  changeComposeSpoilerness,
   changeComposeVisibility,
   clearComposeSuggestions,
   fetchComposeSuggestions,
@@ -117,10 +116,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(insertEmojiCompose(position, emoji));
   },
 
-  onChangeSpoilerness() {
-    dispatch(changeComposeSpoilerness());
-  },
-
   onChangeVisibility(value) {
     dispatch(changeComposeVisibility(value));
   },