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

Add: #483 特定の公開範囲を無効にするオプション (#712)

Browse source 
* Add: #483 特定の公開範囲を無効にするオプション

* Fix test partically

* Complete
This commit is contained in:
KMY（雪あすか） 2024-04-18 12:40:18 +09:00 • committed by GitHub
parent 7f9ec2e510
commit f79fb3adae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 177 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ import {
import { REDRAFT } from '../actions/statuses';
import { STORE_HYDRATE } from '../actions/store';
import { TIMELINE_DELETE } from '../actions/timelines';
import { enableLocalPrivacy, enableLoginPrivacy, enablePublicPrivacy, me } from '../initial_state';
import { enabledVisibilites, me } from '../initial_state';
import { unescapeHTML } from '../utils/html';
import { uuid } from '../uuid';
@ -143,9 +143,6 @@ function clearAll(state) {
if (state.get('stay_privacy') && !state.get('in_reply_to')) {
map.set('default_privacy', state.get('privacy'));
}
if ((map.get('privacy') === 'login' && !enableLoginPrivacy) || (map.get('privacy') === 'public_unlisted' && !enableLocalPrivacy)) {
map.set('privacy', enablePublicPrivacy ? 'public' : 'unlisted');
}
if (!state.get('in_reply_to')) {
map.set('posted_on_this_session', true);
}
@ -153,7 +150,7 @@ function clearAll(state) {
map.set('limited_scope', null);
map.set('id', null);
map.set('in_reply_to', null);
if (state.get('default_searchability') === 'public_unlisted' && !enableLocalPrivacy) {
if (state.get('default_searchability') === 'public_unlisted' && !enabledVisibilites.includes('public_unlisted')) {
map.set('searchability', 'public');
} else {
map.set('searchability', state.get('default_searchability'));
@ -163,6 +160,7 @@ function clearAll(state) {
map.update('media_attachments', list => list.clear());
map.set('poll', null);
map.set('idempotencyKey', uuid());
normalizePrivacy(map);
});
}
@ -243,6 +241,22 @@ const sortHashtagsByUse = (state, tags) => {
return sorted;
};
const normalizePrivacy = (map, last) => {
if (!enabledVisibilites) {
return;
}
const current = map.get('privacy');
const invalid = !enabledVisibilites.includes(current);
if (invalid) {
if (enabledVisibilites.length > 0) {
const index = last ? enabledVisibilites.length - 1 : 0;
map.set('privacy', enabledVisibilites[index]);
}
}
};
const insertEmoji = (state, position, emojiData, needsSpace) => {
const oldText = state.get('text');
const emoji = needsSpace ? ' ' + emojiData.native : emojiData.native;
@ -467,6 +481,8 @@ export default function compose(state = initialState, action) {
map.set('spoiler', false);
map.set('spoiler_text', '');
}
normalizePrivacy(map);
});
case COMPOSE_SUBMIT_REQUEST:
return state.set('is_submitting', true);
@ -532,6 +548,7 @@ export default function compose(state = initialState, action) {
return state.withMutations(map => {
map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
map.set('privacy', 'direct');
normalizePrivacy(map, true);
map.set('focusDate', new Date());
map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
@ -584,6 +601,7 @@ export default function compose(state = initialState, action) {
map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status)));
map.set('in_reply_to', action.status.get('in_reply_to_id'));
map.set('privacy', action.status.get('visibility_ex'));
normalizePrivacy(map);
map.set('reply_to_limited', action.status.get('limited_scope') === 'reply');
map.set('limited_scope', null);
map.set('media_attachments', action.status.get('media_attachments').map((media) => media.set('unattached', true)));