Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-14 15:25:51 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Check media attachment size limit on client side before uploading (#30475)

Browse Source 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
This commit is contained in:
Rens Groothuijsen
2026-09-11 13:14:50 +00:00
committed by GitHub
parent fabe531a29
commit 9ef7f2c837
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,14 +354,23 @@ export function uploadCompose(files) {
dispatch(showAlert({ message: messages.uploadQuote }));
return;
}
const uploadLimit = getState().getIn(['server', 'server', 'item', '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', 'item', 'configuration']);
const maxMediaAttachments = serverConfiguration?.statuses.max_media_attachments ?? 4;
const videoSizeLimit = serverConfiguration?.media_attachments.video_size_limit;
const imageSizeLimit = serverConfiguration?.media_attachments.image_size_limit;
const filesArray = Array.from(files);
const progress = new Array(files.length).fill(0);
const total = filesArray.reduce((a, v) => a + v.size, 0);
let total = Array.from(files).reduce((a, v) => a + v.size, 0);
if (files.length + media.size + pending > uploadLimit) {
if (files.length + media.size + pending > maxMediaAttachments
|| filesArray.some(file => (
file.type.startsWith('video/') && videoSizeLimit && file.size > videoSizeLimit)
|| (file.type.startsWith('image/') && imageSizeLimit && file.size > imageSizeLimit)))
{
dispatch(showAlert({ message: messages.uploadErrorLimit }));
return;
}
@@ -369,7 +378,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);