X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-like.ts;h=f7200db6187be4efb649b9ee25d4c0256eecf499;hb=e5565833f62b97f62ea75eba5b479963ae78b873;hp=0347f95be6648d8f3dbb825f0dd9108523bb8110;hpb=63c93323ecdeaa4b6183d75dd3f13469e1ef3ebd;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts
index 0347f95be..f7200db61 100644
--- a/server/lib/activitypub/process/process-like.ts
+++ b/server/lib/activitypub/process/process-like.ts
@@ -1,14 +1,13 @@
-import { ActivityLike } from '../../../../shared/models/activitypub/activity'
+import { ActivityLike } from '../../../../shared/models/activitypub'
 import { retryTransactionWrapper } from '../../../helpers/database-utils'
-import { database as db } from '../../../initializers'
-import { AccountInstance } from '../../../models/account/account-interface'
-import { getOrCreateAccountAndServer } from '../account'
-import { forwardActivity } from '../send/misc'
-
-async function processLikeActivity (activity: ActivityLike) {
-  const account = await getOrCreateAccountAndServer(activity.actor)
-
-  return processLikeVideo(account, activity)
+import { sequelizeTypescript } from '../../../initializers'
+import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { forwardVideoRelatedActivity } from '../send/utils'
+import { getOrCreateVideoAndAccountAndChannel } from '../videos'
+
+async function processLikeActivity (activity: ActivityLike, byActor: ActorModel) {
+  return retryTransactionWrapper(processLikeVideo, byActor, activity)
 }
 
 // ---------------------------------------------------------------------------
@@ -19,39 +18,32 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processLikeVideo (byAccount: AccountInstance, activity: ActivityLike) {
-  const options = {
-    arguments: [ byAccount, activity ],
-    errorMessage: 'Cannot like the video with many retries.'
-  }
-
-  return retryTransactionWrapper(createVideoLike, options)
-}
-
-function createVideoLike (byAccount: AccountInstance, activity: ActivityLike) {
+async function processLikeVideo (byActor: ActorModel, activity: ActivityLike) {
   const videoUrl = activity.object
 
-  return db.sequelize.transaction(async t => {
-    const video = await db.Video.loadByUrlAndPopulateAccount(videoUrl)
+  const byAccount = byActor.Account
+  if (!byAccount) throw new Error('Cannot create like with the non account actor ' + byActor.url)
 
-    if (!video) throw new Error('Unknown video ' + videoUrl)
+  const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: videoUrl })
 
+  return sequelizeTypescript.transaction(async t => {
     const rate = {
       type: 'like' as 'like',
       videoId: video.id,
       accountId: byAccount.id
     }
-    const [ , created ] = await db.AccountVideoRate.findOrCreate({
+    const [ , created ] = await AccountVideoRateModel.findOrCreate({
       where: rate,
       defaults: rate,
       transaction: t
     })
-    await video.increment('likes', { transaction: t })
+    if (created === true) await video.increment('likes', { transaction: t })
 
     if (video.isOwned() && created === true) {
       // Don't resend the activity to the sender
-      const exceptions = [ byAccount ]
-      await forwardActivity(activity, t, exceptions)
+      const exceptions = [ byActor ]
+
+      await forwardVideoRelatedActivity(activity, t, exceptions, video)
     }
   })
 }