summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-11 12:59:16 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-11 12:59:16 +0900
commit91c1ceefbd3dcf58e0301a3aec67cd5b35356493 (patch)
tree464f13c7bfd63a44fc514001a4530380e0a105d9 /src/server
parentFix bug (diff)
parentFix: AP actor Service のサポートが不完全 (v11) (#4662) (diff)
downloadsharkey-91c1ceefbd3dcf58e0301a3aec67cd5b35356493.tar.gz
sharkey-91c1ceefbd3dcf58e0301a3aec67cd5b35356493.tar.bz2
sharkey-91c1ceefbd3dcf58e0301a3aec67cd5b35356493.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/ap/show.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/api/endpoints/ap/show.ts b/src/server/api/endpoints/ap/show.ts
index 7378e3edc2..35c5dd318d 100644
--- a/src/server/api/endpoints/ap/show.ts
+++ b/src/server/api/endpoints/ap/show.ts
@@ -10,6 +10,7 @@ import { Users, Notes } from '../../../../models';
import { Note } from '../../../../models/entities/note';
import { User } from '../../../../models/entities/user';
import fetchMeta from '../../../../misc/fetch-meta';
+import { validActor } from '../../../../remote/activitypub/type';
export const meta = {
tags: ['federation'],
@@ -110,7 +111,7 @@ async function fetchAny(uri: string) {
}
// それでもみつからなければ新規であるため登録
- if (object.type === 'Person') {
+ if (validActor.includes(object.type)) {
const user = await createPerson(object.id);
return {
type: 'User',