From f6eebcb336c067e160a62020a5140d8d992ba384 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 22 Aug 2018 11:51:39 +0200 Subject: Add ability to search a video with an URL --- server/lib/activitypub/process/process-announce.ts | 4 +--- server/lib/activitypub/process/process-create.ts | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'server/lib/activitypub/process') diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts index d8ca59425..b08156aa1 100644 --- a/server/lib/activitypub/process/process-announce.ts +++ b/server/lib/activitypub/process/process-announce.ts @@ -24,10 +24,8 @@ export { async function processVideoShare (actorAnnouncer: ActorModel, activity: ActivityAnnounce) { const objectUri = typeof activity.object === 'string' ? activity.object : activity.object.id - let video: VideoModel - const res = await getOrCreateAccountAndVideoAndChannel(objectUri) - video = res.video + const { video } = await getOrCreateAccountAndVideoAndChannel(objectUri) return sequelizeTypescript.transaction(async t => { // Add share entry diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index 791148919..9655d015f 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -23,7 +23,7 @@ async function processCreateActivity (activity: ActivityCreate) { } else if (activityType === 'Dislike') { return retryTransactionWrapper(processCreateDislike, actor, activity) } else if (activityType === 'Video') { - return processCreateVideo(actor, activity) + return processCreateVideo(activity) } else if (activityType === 'Flag') { return retryTransactionWrapper(processCreateVideoAbuse, actor, activityObject as VideoAbuseObject) } else if (activityType === 'Note') { @@ -42,13 +42,10 @@ export { // --------------------------------------------------------------------------- -async function processCreateVideo ( - actor: ActorModel, - activity: ActivityCreate -) { +async function processCreateVideo (activity: ActivityCreate) { const videoToCreateData = activity.object as VideoTorrentObject - const { video } = await getOrCreateAccountAndVideoAndChannel(videoToCreateData, actor) + const { video } = await getOrCreateAccountAndVideoAndChannel(videoToCreateData) return video } -- cgit v1.2.3