From 711aa564c1cf219f860e1e96ab4f7efb5e3d140e Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu, 30 Jan 2020 18:58:13 +0900 Subject: AP audience (visibility) パースの修正 (#5783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refactor audience * audienceのないAP Object 対応 * fix * Update src/remote/activitypub/audience.ts Co-Authored-By: Acid Chicken (硫酸鶏) * Update src/remote/activitypub/audience.ts Co-Authored-By: Acid Chicken (硫酸鶏) Co-authored-by: Acid Chicken (硫酸鶏) Co-authored-by: syuilo --- src/remote/activitypub/kernel/create/index.ts | 2 +- src/remote/activitypub/kernel/create/note.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/remote/activitypub/kernel/create') diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts index 395139bb75..5210afe28b 100644 --- a/src/remote/activitypub/kernel/create/index.ts +++ b/src/remote/activitypub/kernel/create/index.ts @@ -19,7 +19,7 @@ export default async (actor: IRemoteUser, activity: ICreate): Promise => { }); if (validPost.includes(object.type)) { - createNote(resolver, actor, object); + createNote(resolver, actor, object, false, activity); } else { logger.warn(`Unknown type: ${object.type}`); } diff --git a/src/remote/activitypub/kernel/create/note.ts b/src/remote/activitypub/kernel/create/note.ts index 6ccaa17ef5..e393440162 100644 --- a/src/remote/activitypub/kernel/create/note.ts +++ b/src/remote/activitypub/kernel/create/note.ts @@ -1,13 +1,13 @@ import Resolver from '../../resolver'; import { IRemoteUser } from '../../../../models/entities/user'; import { createNote, fetchNote } from '../../models/note'; -import { getApId, IObject } from '../../type'; +import { getApId, IObject, ICreate } from '../../type'; import { getApLock } from '../../../../misc/app-lock'; /** * 投稿作成アクティビティを捌きます */ -export default async function(resolver: Resolver, actor: IRemoteUser, note: IObject, silent = false): Promise { +export default async function(resolver: Resolver, actor: IRemoteUser, note: IObject, silent = false, activity?: ICreate): Promise { const uri = getApId(note); const unlock = await getApLock(uri); @@ -15,7 +15,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, note: IObj try { const exist = await fetchNote(note); if (exist == null) { - await createNote(note); + await createNote(note, resolver, silent, activity); } } finally { unlock(); -- cgit v1.2.3-freya