From 56eb896a03068b32469be4ce4dd0dceb8c4a2b4f Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 15 Mar 2019 00:23:24 +0900 Subject: Accept Article object (#4499) --- src/remote/activitypub/kernel/announce/index.ts | 4 +--- src/remote/activitypub/kernel/create/index.ts | 4 +--- src/remote/activitypub/kernel/delete/index.ts | 4 +--- src/remote/activitypub/models/note.ts | 3 ++- 4 files changed, 5 insertions(+), 10 deletions(-) (limited to 'src/remote/activitypub') diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts index 3b2eeb7aa2..5f738da6c7 100644 --- a/src/remote/activitypub/kernel/announce/index.ts +++ b/src/remote/activitypub/kernel/announce/index.ts @@ -24,10 +24,8 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise => switch (object.type) { case 'Note': - announceNote(resolver, actor, activity, object as INote); - break; - case 'Question': + case 'Article': announceNote(resolver, actor, activity, object as INote); break; diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts index 2afdc01377..6e314d0b82 100644 --- a/src/remote/activitypub/kernel/create/index.ts +++ b/src/remote/activitypub/kernel/create/index.ts @@ -29,10 +29,8 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise => { break; case 'Note': - createNote(resolver, actor, object); - break; - case 'Question': + case 'Article': createNote(resolver, actor, object); break; diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts index 864c9f5f7d..c9c385b1fa 100644 --- a/src/remote/activitypub/kernel/delete/index.ts +++ b/src/remote/activitypub/kernel/delete/index.ts @@ -21,10 +21,8 @@ export default async (actor: IRemoteUser, activity: IDelete): Promise => { switch (object.type) { case 'Note': - deleteNote(actor, uri); - break; - case 'Question': + case 'Article': deleteNote(actor, uri); break; diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index c8939279eb..6251621527 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -57,7 +57,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false const object: any = await resolver.resolve(value); - if (!object || !['Note', 'Question'].includes(object.type)) { + if (!object || !['Note', 'Question', 'Article'].includes(object.type)) { logger.error(`invalid note: ${value}`, { resolver: { history: resolver.getHistory() @@ -199,6 +199,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false files, reply, renote: quote, + name: note.name, cw, text, viaMobile: false, -- cgit v1.2.3-freya