diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-12 20:57:04 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-12 20:57:04 +0900 |
| commit | 7e9d3d9b2f28f363952c8d2d45d929e2c6bfea5c (patch) | |
| tree | 6f2c02c7affb95f39875600a4845a867b264c01e /packages/backend/src/core | |
| parent | refactor(test): rename variable for INestApplicationContext (diff) | |
| parent | fix: Do not use avif (#10301) (diff) | |
| download | sharkey-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')
| -rw-r--r-- | packages/backend/src/core/DriveService.ts | 4 | ||||
| -rw-r--r-- | packages/backend/src/core/entities/DriveFileEntityService.ts | 2 |
2 files changed, 3 insertions, 3 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); diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts index 1a6913b800..2d40f444cb 100644 --- a/packages/backend/src/core/entities/DriveFileEntityService.ts +++ b/packages/backend/src/core/entities/DriveFileEntityService.ts @@ -76,7 +76,7 @@ export class DriveFileEntityService { @bindThis private getProxiedUrl(url: string, mode?: 'static' | 'avatar'): string { return appendQuery( - `${this.config.mediaProxy}/${mode ?? 'image'}.${mode === 'avatar' ? 'webp' : 'avif'}`, + `${this.config.mediaProxy}/${mode ?? 'image'}.webp`, query({ url, ...(mode ? { [mode]: '1' } : {}), |