gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Change: #246 公開範囲「ローカル公開」無効と同時に、検索許可「ローカルとフォロワー」も無効にする (#368)

Browse source
This commit is contained in:
KMY（雪あすか） 2023-12-22 10:10:57 +09:00 • committed by GitHub
parent 789afccf9b
commit be77654f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx
View file

@ -15,6 +15,7 @@ import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import { Icon } from 'mastodon/components/icon';
import { enableLocalPrivacy } from 'mastodon/initial_state';
import { IconButton } from '../../../components/icon_button';
@ -237,6 +238,10 @@ class SearchabilityDropdown extends PureComponent {
{ icon: 'lock', iconComponent: LockIcon, value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
{ icon: 'at', iconComponent: AlternateEmailIcon, value: 'limited', text: formatMessage(messages.limited_short), meta: formatMessage(messages.limited_long) },
];
if (!enableLocalPrivacy) {
this.options = this.options.filter((opt) => opt.value !== 'public_unlisted');
}
}
setTargetRef = c => {

6
app/javascript/mastodon/reducers/compose.js
View file

@ -153,7 +153,11 @@ function clearAll(state) {
map.set('limited_scope', null);
map.set('id', null);
map.set('in_reply_to', null);
map.set('searchability', state.get('default_searchability'));
if (state.get('default_searchability') === 'public_unlisted' && !enableLocalPrivacy) {
map.set('searchability', 'public');
} else {
map.set('searchability', state.get('default_searchability'));
}
map.set('sensitive', state.get('default_sensitive'));
map.set('language', state.get('default_language'));
map.update('media_attachments', list => list.clear());