AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

Do not store duplicate reply_privacy

Browse source
This commit is contained in:
Thibaut Girka 2018-07-11 22:41:23 +02:00 committed by ThibG
parent 6f06d16b1e
commit 8c8707771d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/local_settings/page/index.js
View file

@ -78,11 +78,11 @@ export default class LocalSettingsPage extends React.PureComponent {
</LocalSettingsPageItem> </LocalSettingsPageItem>
<LocalSettingsPageItem <LocalSettingsPageItem
settings={settings} settings={settings}
item={['side_arm_auto']} item={['side_arm_reply_mode']}
id='mastodon-settings--side_arm_auto' id='mastodon-settings--side_arm_reply_mode'
onChange={onChange} 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> </LocalSettingsPageItem>
</section> </section>
</div> </div>

3
app/javascript/flavours/glitch/reducers/compose.js
View file

@ -56,7 +56,6 @@ const initialState = ImmutableMap({
spoiler: false, spoiler: false,
spoiler_text: '', spoiler_text: '',
privacy: null, privacy: null,
reply_privacy: null,
text: '', text: '',
focusDate: null, focusDate: null,
caretPosition: 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('in_reply_to', action.status.get('id'));
map.set('text', statusToTextMentions(state, action.status)); map.set('text', statusToTextMentions(state, action.status));
map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy'))); map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
map.set('reply_privacy', action.status.get('visibility'));
map.update( map.update(
'advanced_options', 'advanced_options',
map => map.merge(new ImmutableMap({ do_not_federate: /👁\ufe0f?\u200b?(?:<\/p>)?$/.test(action.status.get('content')) })) 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', false);
map.set('spoiler_text', ''); map.set('spoiler_text', '');
map.set('privacy', state.get('default_privacy')); map.set('privacy', state.get('default_privacy'));
map.set('reply_privacy', null);
map.update( map.update(
'advanced_options', 'advanced_options',
map => map.mergeWith(overwrite, state.get('default_advanced_options')) map => map.mergeWith(overwrite, state.get('default_advanced_options'))