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.

Sign up for GitHub

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

Jump to bottom

refactor(backend): validateNoteの引数の型を強くし、anyを除去 #10325

Merged
merged 3 commits into from
Apr 14, 2023
Merged

refactor(backend): validateNoteの引数の型を強くし、anyを除去 #10325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e869944
refactor(backend): validateNoteの引数の型を推論する
KisaragiEffective Mar 14, 2023
8622100
fix(backend): アサーションの内容から推論してエラーの内容を期待されるであろう式へと変更する
KisaragiEffective Mar 14, 2023
9f86e09
refactor
tamaina Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/backend/src/core/activitypub/models/ApNoteService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class ApNoteService {
}

@bindThis
public validateNote(object: any, uri: string) {
public validateNote(object: IObject, uri: string) {
const expectHost = this.utilityService.extractDbHost(uri);

if (object == null) {
Expand All @@ -84,9 +84,10 @@ export class ApNoteService {
if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`);
}

if (object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo)) !== expectHost) {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.attributedTo)}`);

const actualHost = object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo));
if (object.attributedTo && actualHost !== expectHost) {
return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
}

return null;
Expand Down