Bumped to version v1.0.0-beta.13

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / process / process-like.ts

diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts
index 77fadabe149a7cd2582c48cea0a80b8ce34494c3..9e1664fd8ed8040d1343251b32dd7510ad923a70 100644 (file)
--- a/server/lib/activitypub/process/process-like.ts
+++ b/server/lib/activitypub/process/process-like.ts
@@ -3,14 +3,14 @@ import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { sequelizeTypescript } from '../../../initializers'
 import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
 import { ActorModel } from '../../../models/activitypub/actor'
-import { VideoModel } from '../../../models/video/video'
 import { getOrCreateActorAndServerAndModel } from '../actor'
-import { forwardActivity } from '../send/misc'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateVideoAndAccountAndChannel } from '../videos'
 
 async function processLikeActivity (activity: ActivityLike) {
   const actor = await getOrCreateActorAndServerAndModel(activity.actor)
 
-  return processLikeVideo(actor, activity)
+  return retryTransactionWrapper(processLikeVideo, actor, activity)
 }
 
 // ---------------------------------------------------------------------------
@@ -21,26 +21,15 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processLikeVideo (actor: ActorModel, activity: ActivityLike) {
-  const options = {
-    arguments: [ actor, activity ],
-    errorMessage: 'Cannot like the video with many retries.'
-  }
-
-  return retryTransactionWrapper(createVideoLike, options)
-}
-
-function createVideoLike (byActor: ActorModel, activity: ActivityLike) {
+async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) {
   const videoUrl = activity.object
 
   const byAccount = byActor.Account
   if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url)
 
-  return sequelizeTypescript.transaction(async t => {
-    const video = await VideoModel.loadByUrlAndPopulateAccount(videoUrl)
-
-    if (!video) throw new Error('Unknown video ' + videoUrl)
+  const { video } = await getOrCreateVideoAndAccountAndChannel(videoUrl)
 
+  return sequelizeTypescript.transaction(async t => {
     const rate = {
       type: 'like' as 'like',
       videoId: video.id,
@@ -56,7 +45,8 @@ function createVideoLike (byActor: ActorModel, activity: ActivityLike) {
     if (video.isOwned() && created === true) {
       // Don't resend the activity to the sender
       const exceptions = [ byActor ]
-      await forwardActivity(activity, t, exceptions)
+
+      await forwardVideoRelatedActivity(activity, t, exceptions, video)
     }
   })
 }