summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/DriveService.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-03-12 20:57:04 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-03-12 20:57:04 +0900
commit7e9d3d9b2f28f363952c8d2d45d929e2c6bfea5c (patch)
tree6f2c02c7affb95f39875600a4845a867b264c01e /packages/backend/src/core/DriveService.ts
parentrefactor(test): rename variable for INestApplicationContext (diff)
parentfix: Do not use avif (#10301) (diff)
downloadsharkey-7e9d3d9b2f28f363952c8d2d45d929e2c6bfea5c.tar.gz
sharkey-7e9d3d9b2f28f363952c8d2d45d929e2c6bfea5c.tar.bz2
sharkey-7e9d3d9b2f28f363952c8d2d45d929e2c6bfea5c.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src/core/DriveService.ts')
-rw-r--r--packages/backend/src/core/DriveService.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index 7eccf4b3b1..f1e93d6dd9 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -295,7 +295,7 @@ export class DriveService {
satisfyWebpublic = !!(
type !== 'image/svg+xml' && // security reason
- type !== 'image/avif' && // not supported by Mastodon
+ type !== 'image/avif' && // not supported by Mastodon and MS Edge
!(metadata.exif ?? metadata.iptc ?? metadata.xmp ?? metadata.tifftagPhotoshop) &&
metadata.width && metadata.width <= 2048 &&
metadata.height && metadata.height <= 2048
@@ -339,7 +339,7 @@ export class DriveService {
if (isAnimated) {
thumbnail = await this.imageProcessingService.convertSharpToWebp(sharp(path, { animated: true }), 374, 317, { alphaQuality: 70 });
} else {
- thumbnail = await this.imageProcessingService.convertSharpToAvif(img, 498, 422);
+ thumbnail = await this.imageProcessingService.convertSharpToWebp(img, 498, 422);
}
} catch (err) {
this.registerLogger.warn('thumbnail not created (an error occured)', err as Error);