diff options
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r-- | app/javascript/flavours/glitch/features/composer/index.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/page/index.js | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/index.js b/app/javascript/flavours/glitch/features/composer/index.js index 95cb93f30..72948253d 100644 --- a/app/javascript/flavours/glitch/features/composer/index.js +++ b/app/javascript/flavours/glitch/features/composer/index.js @@ -67,7 +67,7 @@ function mapStateToProps (state) { replyAccount: inReplyTo ? state.getIn(['statuses', inReplyTo, 'account']) : null, replyContent: inReplyTo ? state.getIn(['statuses', inReplyTo, 'contentHtml']) : null, resetFileKey: state.getIn(['compose', 'resetFileKey']), - sideArm: state.getIn(['local_settings', 'side_arm']), + sideArm: (state.getIn(['local_settings', 'side_arm_auto']) ? state.getIn(['compose', 'reply_privacy']) : null) || state.getIn(['local_settings', 'side_arm']), sensitive: state.getIn(['compose', 'sensitive']), showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']), spoiler: state.getIn(['compose', 'spoiler']), diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js index 62bf410c6..8a09bb6f0 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js @@ -76,6 +76,14 @@ export default class LocalSettingsPage extends React.PureComponent { > <FormattedMessage id='settings.side_arm' defaultMessage='Secondary toot button:' /> </LocalSettingsPageItem> + <LocalSettingsPageItem + settings={settings} + item={['side_arm_auto']} + id='mastodon-settings--side_arm_auto' + onChange={onChange} + > + <FormattedMessage id='settings.side_arm_auto' defaultMessage='Auto privacy for secondary toot button' /> + </LocalSettingsPageItem> </section> </div> ), |