OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-22 18:45:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove redundant upload limit variable and check number of attached files only once

Browse source
This commit is contained in:
Rens Groothuijsen 2024-09-29 21:50:04 +02:00
parent 34e3869006
commit a9f9357ae4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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