Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-20 08:25:54 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix oversized profile image crop uploads (#39958)

Browse Source
This commit is contained in:
Sharlayan
2026-07-28 22:49:32 +09:00
committed by Claire
parent 2096076b25
commit fe7e2251db
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/mastodon/features/account_edit/modals/image_upload.tsx
View File

@@ -94,12 +94,12 @@ export const ImageUploadModal: FC<
setStep('select');
return;
}
void calculateCroppedImage(imageSrc, crop).then((blob) => {
void calculateCroppedImage(imageSrc, crop, location).then((blob) => {
setImageBlob(blob);
setStep('alt');
});
},
[imageSrc],
[imageSrc, location],
);
const dispatch = useAppDispatch();
@@ -418,9 +418,14 @@ const StepAlt: FC<{
async function calculateCroppedImage(
imageSrc: string,
crop: Area,
location: ImageLocation,
): Promise<Blob> {
const image = await dataUriToImage(imageSrc);
const canvas = new OffscreenCanvas(crop.width, crop.height);
const maxWidth = location === 'avatar' ? 400 : 1500;
const scale = Math.min(1, maxWidth / crop.width);
const width = Math.round(crop.width * scale);
const height = Math.round(crop.height * scale);
const canvas = new OffscreenCanvas(width, height);
const ctx = canvas.getContext('2d');
if (!ctx) {
throw new Error('Failed to get canvas context');
@@ -437,8 +442,8 @@ async function calculateCroppedImage(
crop.height,
0,
0,
crop.width,
crop.height,
width,
height,
);
return canvas.convertToBlob();