profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: AP actor Service のサポートが不完全 (v11) (#4662)

Browse source
This commit is contained in:
MeiMei 2019-04-11 03:09:12 +09:00 • committed by syuilo
parent ab302df0ae
commit 2a7e3b9c51
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/remote/activitypub/models/person.ts
View file

@ -24,6 +24,7 @@ import { UserPublickey } from '../../../models/entities/user-publickey';
import { isDuplicateKeyValueError } from '../../../misc/is-duplicate-key-value-error';
import { toPuny } from '../../../misc/convert-host';
import { UserProfile } from '../../../models/entities/user-profile';
import { validActor } from '../../../remote/activitypub/type';
const logger = apLogger;
/**
@ -38,7 +39,7 @@ function validatePerson(x: any, uri: string) {
return new Error('invalid person: object is null');
}
if (x.type != 'Person' && x.type != 'Service') {
if (!validActor.includes(x.type)) {
return new Error(`invalid person: object is not a person or service '${x.type}'`);
}

2
src/remote/activitypub/type.ts
View file

@ -65,6 +65,8 @@ interface IQuestionChoice {
_misskey_votes?: number;
}
export const validActor = ['Person', 'Service'];
export interface IPerson extends IObject {
type: 'Person';
name: string;