From 1affcf73fba21c09d1ee4aa3ef52829ad1336005 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Thu, 7 Mar 2019 06:20:27 -0600 Subject: add option to default to local only --- app/javascript/flavours/glitch/reducers/compose.js | 4 ++-- app/javascript/mastodon/initial_state.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index 094b7d476..8bb1aa642 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -45,7 +45,7 @@ import { REDRAFT } from 'flavours/glitch/actions/statuses'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import uuid from 'flavours/glitch/util/uuid'; import { privacyPreference } from 'flavours/glitch/util/privacy_preference'; -import { me, defaultContentType } from 'flavours/glitch/util/initial_state'; +import { me, defaultContentType, defaultLocal } from 'flavours/glitch/util/initial_state'; import { overwrite } from 'flavours/glitch/util/js_helpers'; import { unescapeHTML } from 'flavours/glitch/util/html'; import { recoverHashtags } from 'flavours/glitch/util/hashtag'; @@ -59,7 +59,7 @@ const glitchProbability = 1 - 0.0420215528; const initialState = ImmutableMap({ mounted: false, advanced_options: ImmutableMap({ - do_not_federate: false, + do_not_federate: defaultLocal, threaded_mode: false, }), sensitive: false, diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index d74f5ceb1..ac8e51938 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -11,6 +11,7 @@ export const unfollowModal = getMeta('unfollow_modal'); export const boostModal = getMeta('boost_modal'); export const deleteModal = getMeta('delete_modal'); export const me = getMeta('me'); +export const defaultLocal = getMeta('default_local'); export const searchEnabled = getMeta('search_enabled'); export const maxChars = (initialState && initialState.max_toot_chars) || 500; export const invitesEnabled = getMeta('invites_enabled'); -- cgit