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

Fix image & blurhash info when skipping thumbnail due to thresholds

pull/21833/head
Michael Telatynski 2021-08-05 13:12:01 +01:00
parent 99adbfd1ea
commit 980b284642
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ContentMessages.tsx
View File

@ -226,11 +226,6 @@ const IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT = 0.1; // 10%
* @return {Promise} A promise that resolves with the attachment info. * @return {Promise} A promise that resolves with the attachment info.
*/ */
async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imageFile: File) { async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imageFile: File) {
if (imageFile.size <= IMAGE_SIZE_THRESHOLD_THUMBNAIL) {
// don't bother generating a thumbnail, image is small enough already
return {};
}
let thumbnailType = "image/png"; let thumbnailType = "image/png";
if (imageFile.type === "image/jpeg") { if (imageFile.type === "image/jpeg") {
thumbnailType = "image/jpeg"; thumbnailType = "image/jpeg";
@ -238,20 +233,18 @@ async function infoForImageFile(matrixClient: MatrixClient, roomId: string, imag
const imageElement = await loadImageElement(imageFile); const imageElement = await loadImageElement(imageFile);
if (imageElement.width < MAX_WIDTH && imageElement.height < MAX_HEIGHT) {
// don't bother uploading thumbnail as it'd be the same resolution as the original.
return {};
}
const result = await createThumbnail(imageElement.img, imageElement.width, imageElement.height, thumbnailType); const result = await createThumbnail(imageElement.img, imageElement.width, imageElement.height, thumbnailType);
const imageInfo = result.info; const imageInfo = result.info;
// we do all sizing checks here because we still rely on thumbnail generation for making a blurhash from.
const sizeDifference = imageFile.size - imageInfo.thumbnail_info.size; const sizeDifference = imageFile.size - imageInfo.thumbnail_info.size;
if (sizeDifference <= IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE && if (
sizeDifference <= (imageFile.size * IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT) imageFile.size <= IMAGE_SIZE_THRESHOLD_THUMBNAIL || // image is small enough already
(sizeDifference <= IMAGE_THUMBNAIL_MIN_REDUCTION_SIZE && // thumbnail is not sufficiently smaller than original
sizeDifference <= (imageFile.size * IMAGE_THUMBNAIL_MIN_REDUCTION_PERCENT))
) { ) {
// don't bother uploading thumbnail as it not sufficiently smaller than the original. delete imageInfo["thumbnail_info"];
return {}; return imageInfo;
} }
const uploadResult = await uploadFile(matrixClient, roomId, result.thumbnail); const uploadResult = await uploadFile(matrixClient, roomId, result.thumbnail);