From 2ccaeeb341ffe8c2609039bf4c6d8835b4650316 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Jan 2018 17:18:12 +0100 Subject: Fetch remote AP objects --- server/lib/activitypub/process/process-announce.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'server/lib/activitypub/process/process-announce.ts') diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts index 9adb40e01..bf7d7879d 100644 --- a/server/lib/activitypub/process/process-announce.ts +++ b/server/lib/activitypub/process/process-announce.ts @@ -7,6 +7,7 @@ import { VideoModel } from '../../../models/video/video' import { VideoShareModel } from '../../../models/video/video-share' import { getOrCreateActorAndServerAndModel } from '../actor' import { forwardActivity } from '../send/misc' +import { getOrCreateAccountAndVideoAndChannel } from '../videos' import { processCreateActivity } from './process-create' async function processAnnounceActivity (activity: ActivityAnnounce) { @@ -44,19 +45,19 @@ function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnoun return retryTransactionWrapper(shareVideo, options) } -function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) { +async function shareVideo (actorAnnouncer: ActorModel, activity: ActivityAnnounce) { const announced = activity.object + let video: VideoModel + + if (typeof announced === 'string') { + const res = await getOrCreateAccountAndVideoAndChannel(announced) + video = res.video + } else { + video = await processCreateActivity(announced) + } return sequelizeTypescript.transaction(async t => { // Add share entry - let video: VideoModel - - if (typeof announced === 'string') { - video = await VideoModel.loadByUrlAndPopulateAccount(announced) - if (!video) throw new Error('Unknown video to share ' + announced) - } else { - video = await processCreateActivity(announced) - } const share = { actorId: actorAnnouncer.id, -- cgit v1.2.3