OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve MImageBody error handling (#9663) 

* Improve MImageBody error handling

* Fix strict errors

* We can assert this as isAnimated would be false if no content.info.mimetype
pull/28788/head^2
Michael Telatynski 2022-12-05 12:50:19 +00:00 committed by GitHub
parent 7065c58174
commit 5f76528832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/views/messages/MImageBody.tsx
View File

@ -270,6 +270,7 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
// Set a placeholder image when we can't decrypt the image. // Set a placeholder image when we can't decrypt the image.
this.setState({ error }); this.setState({ error });
return;
} }
} else { } else {
thumbUrl = this.getThumbUrl(); thumbUrl = this.getThumbUrl();
@ -291,17 +292,28 @@ export default class MImageBody extends React.Component<IBodyProps, IState> {
img.crossOrigin = "Anonymous"; // CORS allow canvas access img.crossOrigin = "Anonymous"; // CORS allow canvas access
img.src = contentUrl; img.src = contentUrl;
try {
await loadPromise; await loadPromise;
} catch (error) {
logger.error("Unable to download attachment: ", error);
this.setState({ error: error as Error });
return;
}
try {
const blob = await this.props.mediaEventHelper.sourceBlob.value; const blob = await this.props.mediaEventHelper.sourceBlob.value;
if (!await blobIsAnimated(content.info.mimetype, blob)) { if (!await blobIsAnimated(content.info?.mimetype, blob)) {
isAnimated = false; isAnimated = false;
} }
if (isAnimated) { if (isAnimated) {
const thumb = await createThumbnail(img, img.width, img.height, content.info.mimetype, false); const thumb = await createThumbnail(img, img.width, img.height, content.info!.mimetype, false);
thumbUrl = URL.createObjectURL(thumb.thumbnail); thumbUrl = URL.createObjectURL(thumb.thumbnail);
} }
} catch (error) {
// This is a non-critical failure, do not surface the error or bail the method here
logger.warn("Unable to generate thumbnail for animated image: ", error);
}
} }
} }