diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2024-02-21 14:42:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-21 14:42:37 +0900 |
| commit | ae27085f691f331591117f531860b9c510897ae8 (patch) | |
| tree | e0c75e48d6d45eeaf8a49daec6c70f74eac4b8ea /packages/backend | |
| parent | refactor(backend): `ReactionService.prototype.convertLegacyReactions` (#13375) (diff) | |
| download | misskey-ae27085f691f331591117f531860b9c510897ae8.tar.gz misskey-ae27085f691f331591117f531860b9c510897ae8.tar.bz2 misskey-ae27085f691f331591117f531860b9c510897ae8.zip | |
fix: Bump sharp to 0.33.2 (#13391)
Diffstat (limited to 'packages/backend')
| -rw-r--r-- | packages/backend/package.json | 4 | ||||
| -rw-r--r-- | packages/backend/src/core/FileInfoService.ts | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/packages/backend/package.json b/packages/backend/package.json index 86a52faa05..3a3d8e0411 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -79,7 +79,7 @@ "@fastify/multipart": "8.1.0", "@fastify/static": "6.12.0", "@fastify/view": "8.2.0", - "@misskey-dev/sharp-read-bmp": "^1.1.1", + "@misskey-dev/sharp-read-bmp": "^1.2.0", "@misskey-dev/summaly": "^5.0.3", "@nestjs/common": "10.2.10", "@nestjs/core": "10.2.10", @@ -164,7 +164,7 @@ "rxjs": "7.8.1", "sanitize-html": "2.11.0", "secure-json-parse": "2.7.0", - "sharp": "0.32.6", + "sharp": "0.33.2", "slacc": "0.0.10", "strict-event-emitter-types": "2.0.0", "stringz": "2.1.0", 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' }) |