Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
467c848
fix: image upload failing for specific jpegs
cardoso Apr 17, 2025
e35a9f2
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 20, 2025
ef168d3
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
cardoso Apr 21, 2025
1216317
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
cardoso Apr 22, 2025
ad646da
fix: display error indicator when image upload fails
cardoso Apr 22, 2025
36c44ad
test: with and without Message_Attachments_Strip_Exif
cardoso Apr 22, 2025
0fee022
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 24, 2025
86a7e82
chore: add changeset
cardoso Apr 24, 2025
8545447
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 24, 2025
ca4c75c
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 25, 2025
a90d908
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 29, 2025
3d68509
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 29, 2025
5d41a4b
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso Apr 30, 2025
ba30030
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
cardoso May 7, 2025
7c96888
fix: handle possible empty string
cardoso May 7, 2025
e3caef8
fix: handle possible empty string
cardoso May 7, 2025
eca914b
fix: handle error response for file upload in send function
cardoso May 7, 2025
04c87e2
fix: UploadProgressIndicator a11y
dougfabris May 8, 2025
525b023
test: updates image upload error selector
cardoso May 8, 2025
e26d291
fix: review
dougfabris May 8, 2025
f893616
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
kodiakhq[bot] May 9, 2025
bff8ede
Merge branch 'develop' into SUP-769-Image-Upload-Display-Error-Messag…
kodiakhq[bot] May 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/app/file-upload/server/lib/FileUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export const FileUpload = {
file = FileUpload.addExtensionTo(file);
const image = await FileUpload.getStore('Uploads')._store.getReadStream(file._id, file);

const transformer = sharp().resize({ width: 32, height: 32, fit: 'inside' }).jpeg().blur();
const transformer = sharp({ failOn: 'error' }).resize({ width: 32, height: 32, fit: 'inside' }).jpeg().blur();
Comment thread
cardoso marked this conversation as resolved.
Outdated
const result = transformer.toBuffer().then((out) => out.toString('base64'));
image.pipe(transformer);
return result;
Expand Down Expand Up @@ -320,7 +320,7 @@ export const FileUpload = {
const store = FileUpload.getStore('Uploads');
const image = await store._store.getReadStream(file._id, file);

let transformer = sharp().resize({ width, height, fit: 'inside' });
let transformer = sharp({ failOn: 'error' }).resize({ width, height, fit: 'inside' });

if (file.type === 'image/svg+xml') {
transformer = transformer.png();
Expand Down