1 files changed, 16 insertions, 9 deletions

diff --git a/server/lib/activitypub/process/process-like.ts b/server/lib/activitypub/process/process-like.ts
index d77b30f24..0347f95be 100644
--- a/server/lib/activitypub/process/process-like.ts
+++ b/server/lib/activitypub/process/process-like.ts
@@ -1,14 +1,14 @@
 import { ActivityLike } from '../../../../shared/models/activitypub/activity'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
 import { database as db } from '../../../initializers'
 import { AccountInstance } from '../../../models/account/account-interface'
 import { getOrCreateAccountAndServer } from '../account'
-import { sendLikeToVideoFollowers } from '../send/send-like'
-import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { forwardActivity } from '../send/misc'
 
 async function processLikeActivity (activity: ActivityLike) {
   const account = await getOrCreateAccountAndServer(activity.actor)
 
-  return processLikeVideo(account, activity.object)
+  return processLikeVideo(account, activity)
 }
 
 // ---------------------------------------------------------------------------
@@ -19,16 +19,18 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function processLikeVideo (byAccount: AccountInstance, videoUrl: string) {
+async function processLikeVideo (byAccount: AccountInstance, activity: ActivityLike) {
   const options = {
-    arguments: [ byAccount, videoUrl ],
+    arguments: [ byAccount, activity ],
     errorMessage: 'Cannot like the video with many retries.'
   }
 
   return retryTransactionWrapper(createVideoLike, options)
 }
 
-function createVideoLike (byAccount: AccountInstance, videoUrl: string) {
+function createVideoLike (byAccount: AccountInstance, activity: ActivityLike) {
+  const videoUrl = activity.object
+
   return db.sequelize.transaction(async t => {
     const video = await db.Video.loadByUrlAndPopulateAccount(videoUrl)
 
@@ -41,10 +43,15 @@ function createVideoLike (byAccount: AccountInstance, videoUrl: string) {
     }
     const [ , created ] = await db.AccountVideoRate.findOrCreate({
       where: rate,
-      defaults: rate
+      defaults: rate,
+      transaction: t
     })
-    await video.increment('likes')
+    await video.increment('likes', { transaction: t })
 
-    if (video.isOwned() && created === true) await sendLikeToVideoFollowers(byAccount, video, undefined)
+    if (video.isOwned() && created === true) {
+      // Don't resend the activity to the sender
+      const exceptions = [ byAccount ]
+      await forwardActivity(activity, t, exceptions)
+    }
   })
 }