diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-03-01 21:17:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 21:17:01 +0900 |
| commit | 7e706ea6693781fb8973800bb3d0c91b5ab91cdf (patch) | |
| tree | 8abd91edd288284cf3cc47949e749f881cfaff8e /packages/backend/src/core/FileInfoService.ts | |
| parent | Merge pull request #13045 from misskey-dev/develop (diff) | |
| parent | New translations ja-jp.yml (Chinese Traditional) (#13480) (diff) | |
| download | sharkey-7e706ea6693781fb8973800bb3d0c91b5ab91cdf.tar.gz sharkey-7e706ea6693781fb8973800bb3d0c91b5ab91cdf.tar.bz2 sharkey-7e706ea6693781fb8973800bb3d0c91b5ab91cdf.zip | |
Merge pull request #13447 from misskey-dev/develop
Release: 2024.3.0
Diffstat (limited to 'packages/backend/src/core/FileInfoService.ts')
| -rw-r--r-- | packages/backend/src/core/FileInfoService.ts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/backend/src/core/FileInfoService.ts b/packages/backend/src/core/FileInfoService.ts index b177367a16..b8babcb3a7 100644 --- a/packages/backend/src/core/FileInfoService.ts +++ b/packages/backend/src/core/FileInfoService.ts @@ -15,6 +15,7 @@ import isSvg from 'is-svg'; import probeImageSize from 'probe-image-size'; import { type predictionType } from 'nsfwjs'; import sharp from 'sharp'; +import { sharpBmp } from '@misskey-dev/sharp-read-bmp'; import { encode } from 'blurhash'; import { createTempDir } from '@/misc/create-temp.js'; import { AiService } from '@/core/AiService.js'; @@ -122,7 +123,7 @@ export class FileInfoService { 'image/avif', 'image/svg+xml', ].includes(type.mime)) { - blurhash = await this.getBlurhash(path).catch(e => { + blurhash = await this.getBlurhash(path, type.mime).catch(e => { warnings.push(`getBlurhash failed: ${e}`); return undefined; }); @@ -407,9 +408,9 @@ export class FileInfoService { * Calculate average color of image */ @bindThis - private getBlurhash(path: string): Promise<string> { - return new Promise((resolve, reject) => { - sharp(path) + private getBlurhash(path: string, type: string): Promise<string> { + return new Promise(async (resolve, reject) => { + (await sharpBmp(path, type)) .raw() .ensureAlpha() .resize(64, 64, { fit: 'inside' }) |