gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 20:26:15 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge a9f9357ae4 into fbe9728f36

Browse Source
This commit is contained in:
Rens Groothuijsen 2025-05-06 15:03:45 +00:00 committed by GitHub
commit e920093e05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/javascript/mastodon/actions/compose.js
View File

@ -298,14 +298,20 @@ export function submitComposeFail(error) {
export function uploadCompose(files) {
return function (dispatch, getState) {
const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
const media = getState().getIn(['compose', 'media_attachments']);
const pending = getState().getIn(['compose', 'pending_media_attachments']);
const serverConfiguration = getState().getIn(['server', 'server', 'configuration']);
const maxMediaAttachments = serverConfiguration.getIn(['statuses', 'max_media_attachments']);
const videoSizeLimit = serverConfiguration.getIn(['media_attachments', 'video_size_limit']);
const imageSizeLimit = serverConfiguration.getIn(['media_attachments', 'image_size_limit']);
const filesArray = Array.from(files);
const progress = new Array(files.length).fill(0);
let total = Array.from(files).reduce((a, v) => a + v.size, 0);
if (files.length + media.size + pending > uploadLimit) {
let total = filesArray.reduce((a, v) => a + v.size, 0);
if (files.length + media.size + pending > maxMediaAttachments
|| filesArray.some(file => (
file.type.match(/video\/.*/) && file.size > videoSizeLimit)
|| (file.type.match(/image\/.*/) && file.size > imageSizeLimit)))
{
dispatch(showAlert({ message: messages.uploadErrorLimit }));
return;
}
@ -318,7 +324,7 @@ export function uploadCompose(files) {
dispatch(uploadComposeRequest());
for (const [i, file] of Array.from(files).entries()) {
if (media.size + i > (uploadLimit - 1)) break;
if (media.size + i > (maxMediaAttachments - 1)) break;
const data = new FormData();
data.append('file', file);