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

Fix: メディアを常に閲覧注意にする設定にしている人が画像アップロード時、閲覧注意を外す手段がない問題 (#613)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-02-27 10:14:54 +09:00 • committed by GitHub
parent 9dd11117db
commit 252ea948d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/actions/compose.js
View file

@ -213,7 +213,7 @@ export function submitCompose(routerHistory) {
in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null), in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
media_ids: media.map(item => item.get('id')), media_ids: media.map(item => item.get('id')),
media_attributes, media_attributes,
sensitive: media.size > 0 ? getState().getIn(['compose', 'sensitive']) : false, sensitive: media.size > 0 ? getState().getIn(['compose', 'spoiler']) : false,
spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '', spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
markdown: getState().getIn(['compose', 'markdown']), markdown: getState().getIn(['compose', 'markdown']),
visibility: getState().getIn(['compose', 'privacy']), visibility: getState().getIn(['compose', 'privacy']),
@ -306,6 +306,8 @@ export function uploadCompose(files) {
const uploadLimit = 4; const uploadLimit = 4;
const media = getState().getIn(['compose', 'media_attachments']); const media = getState().getIn(['compose', 'media_attachments']);
const pending = getState().getIn(['compose', 'pending_media_attachments']); const pending = getState().getIn(['compose', 'pending_media_attachments']);
const defaultSensitive = getState().getIn(['compose', 'default_sensitive']);
const spoiler = getState().getIn(['compose', 'spoiler']);
const progress = new Array(files.length).fill(0); const progress = new Array(files.length).fill(0);
let total = Array.from(files).reduce((a, v) => a + v.size, 0); let total = Array.from(files).reduce((a, v) => a + v.size, 0);
@ -334,6 +336,10 @@ export function uploadCompose(files) {
if (status === 200) { if (status === 200) {
dispatch(uploadComposeSuccess(data, file)); dispatch(uploadComposeSuccess(data, file));
if (defaultSensitive && !spoiler) {
dispatch(changeComposeSpoilerness());
}
} else if (status === 202) { } else if (status === 202) {
dispatch(uploadComposeProcessing()); dispatch(uploadComposeProcessing());