Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(backend): FreeBSDで起動できない問題を修正 #15418

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
- Fix: pgroongaでの検索時にはじめのキーワードのみが検索に使用される問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/886)
- Fix: メールアドレスの形式が正しくなければ以降の処理を行わないように
- Fix: FreeBSDで起動できない問題を修正
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/887)

## 2025.2.0

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"@fastify/view": "10.0.2",
"@misskey-dev/sharp-read-bmp": "1.2.0",
"@misskey-dev/summaly": "5.2.0",
"@napi-rs/canvas": "0.1.67",
"@nestjs/common": "11.0.9",
"@nestjs/core": "11.0.9",
"@nestjs/testing": "11.0.9",
Expand All @@ -105,6 +104,7 @@
"body-parser": "1.20.3",
"bullmq": "5.41.0",
"cacheable-lookup": "7.0.0",
"canvas": "3.1.0",
"cbor": "9.0.2",
"chalk": "5.4.1",
"chalk-template": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/core/UserListService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class UserListService implements OnApplicationShutdown, OnModuleInit {
}

async onModuleInit() {
this.roleService = this.moduleRef.get(RoleService.name);
this.roleService = this.moduleRef.get(RoleService);
}

@bindThis
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/misc/gen-identicon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* https://en.wikipedia.org/wiki/Identicon
*/

import { createCanvas } from '@napi-rs/canvas';
import { createCanvas } from 'canvas';
import gen from 'random-seed';

const size = 128; // px
Expand Down Expand Up @@ -100,5 +100,5 @@ export async function genIdenticon(seed: string): Promise<Buffer> {
}
}

return await canvas.encode('png');
return await canvas.toBuffer('image/png');
}
Loading
Loading