From 13c51133d34be32457de4dd35c275aca216b2452 Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 26 Sep 2023 17:53:36 +0900 Subject: [PATCH] Fix always set public visibility when login visibility is locked --- app/javascript/mastodon/reducers/compose.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index c57fa01761..2947012fd4 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -58,7 +58,7 @@ import { import { REDRAFT } from '../actions/statuses'; import { STORE_HYDRATE } from '../actions/store'; import { TIMELINE_DELETE } from '../actions/timelines'; -import { enableLocalPrivacy, me } from '../initial_state'; +import { enableLocalPrivacy, enableLoginPrivacy, me } from '../initial_state'; import { unescapeHTML } from '../utils/html'; import { uuid } from '../uuid'; @@ -138,7 +138,7 @@ function clearAll(state) { if (state.get('stay_privacy') && !state.get('in_reply_to')) { map.set('default_privacy', state.get('privacy')); } - if (map.get('privacy') && !enableLocalPrivacy) { + if ((map.get('privacy') === 'login' && !enableLoginPrivacy) || (map.get('privacy') === 'public_unlisted' && !enableLocalPrivacy)) { map.set('privacy', 'public'); } if (!state.get('in_reply_to')) {