From 8c8707771df61a30d0a66efd9377a3c5e29ff1d0 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 11 Jul 2018 22:41:23 +0200
Subject: [PATCH] Do not store duplicate reply_privacy

---
 .../flavours/glitch/features/local_settings/page/index.js   | 6 +++---
 app/javascript/flavours/glitch/reducers/compose.js          | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

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 8a09bb6f00..702034cdf8 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js
@@ -78,11 +78,11 @@ export default class LocalSettingsPage extends React.PureComponent {
           </LocalSettingsPageItem>
           <LocalSettingsPageItem
             settings={settings}
-            item={['side_arm_auto']}
-            id='mastodon-settings--side_arm_auto'
+            item={['side_arm_reply_mode']}
+            id='mastodon-settings--side_arm_reply_mode'
             onChange={onChange}
           >
-            <FormattedMessage id='settings.side_arm_auto' defaultMessage='Auto privacy for secondary toot button' />
+            <FormattedMessage id='settings.side_arm_reply_mode' defaultMessage='When replying to a toot:' />
           </LocalSettingsPageItem>
         </section>
       </div>
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index c04fe545fd..a7ce71676c 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -56,7 +56,6 @@ const initialState = ImmutableMap({
   spoiler: false,
   spoiler_text: '',
   privacy: null,
-  reply_privacy: null,
   text: '',
   focusDate: null,
   caretPosition: null,
@@ -291,7 +290,6 @@ export default function compose(state = initialState, action) {
       map.set('in_reply_to', action.status.get('id'));
       map.set('text', statusToTextMentions(state, action.status));
       map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
-      map.set('reply_privacy', action.status.get('visibility'));
       map.update(
         'advanced_options',
         map => map.merge(new ImmutableMap({ do_not_federate: /👁\ufe0f?\u200b?(?:<\/p>)?$/.test(action.status.get('content')) }))
@@ -317,7 +315,6 @@ export default function compose(state = initialState, action) {
       map.set('spoiler', false);
       map.set('spoiler_text', '');
       map.set('privacy', state.get('default_privacy'));
-      map.set('reply_privacy', null);
       map.update(
         'advanced_options',
         map => map.mergeWith(overwrite, state.get('default_advanced_options'))