X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-follow.ts;h=0cd537187a93ccacc939d85f0258ef473f68a28b;hb=594d0c6a7c64b045c11508bb4e4b19b75b3fc557;hp=ccaee43a66c7317bbc8997309b975c516d3091d5;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/process/process-follow.ts b/server/lib/activitypub/process/process-follow.ts
index ccaee43a6..0cd537187 100644
--- a/server/lib/activitypub/process/process-follow.ts
+++ b/server/lib/activitypub/process/process-follow.ts
@@ -1,16 +1,17 @@
 import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { logger, retryTransactionWrapper } from '../../../helpers'
+import { retryTransactionWrapper } from '../../../helpers/database-utils'
+import { logger } from '../../../helpers/logger'
 import { sequelizeTypescript } from '../../../initializers'
-import { AccountModel } from '../../../models/account/account'
-import { AccountFollowModel } from '../../../models/account/account-follow'
-import { getOrCreateAccountAndServer } from '../account'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
 import { sendAccept } from '../send'
+import { Notifier } from '../../notifier'
+import { getAPId } from '../../../helpers/activitypub'
 
-async function processFollowActivity (activity: ActivityFollow) {
-  const activityObject = activity.object
-  const account = await getOrCreateAccountAndServer(activity.actor)
+async function processFollowActivity (activity: ActivityFollow, byActor: ActorModel) {
+  const activityObject = getAPId(activity.object)
 
-  return processFollow(account, activityObject)
+  return retryTransactionWrapper(processFollow, byActor, activityObject)
 }
 
 // ---------------------------------------------------------------------------
@@ -21,46 +22,44 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function processFollow (account: AccountModel, targetAccountURL: string) {
-  const options = {
-    arguments: [ account, targetAccountURL ],
-    errorMessage: 'Cannot follow with many retries.'
-  }
+async function processFollow (actor: ActorModel, targetActorURL: string) {
+  const { actorFollow, created } = await sequelizeTypescript.transaction(async t => {
+    const targetActor = await ActorModel.loadByUrlAndPopulateAccountAndChannel(targetActorURL, t)
 
-  return retryTransactionWrapper(follow, options)
-}
-
-async function follow (account: AccountModel, targetAccountURL: string) {
-  await sequelizeTypescript.transaction(async t => {
-    const targetAccount = await AccountModel.loadByUrl(targetAccountURL, t)
-
-    if (!targetAccount) throw new Error('Unknown account')
-    if (targetAccount.isOwned() === false) throw new Error('This is not a local account.')
+    if (!targetActor) throw new Error('Unknown actor')
+    if (targetActor.isOwned() === false) throw new Error('This is not a local actor.')
 
-    const [ accountFollow ] = await AccountFollowModel.findOrCreate({
+    const [ actorFollow, created ] = await ActorFollowModel.findOrCreate({
       where: {
-        accountId: account.id,
-        targetAccountId: targetAccount.id
+        actorId: actor.id,
+        targetActorId: targetActor.id
       },
       defaults: {
-        accountId: account.id,
-        targetAccountId: targetAccount.id,
+        actorId: actor.id,
+        targetActorId: targetActor.id,
         state: 'accepted'
       },
       transaction: t
     })
 
-    if (accountFollow.state !== 'accepted') {
-      accountFollow.state = 'accepted'
-      await accountFollow.save({ transaction: t })
+    actorFollow.ActorFollower = actor
+    actorFollow.ActorFollowing = targetActor
+
+    if (actorFollow.state !== 'accepted') {
+      actorFollow.state = 'accepted'
+      await actorFollow.save({ transaction: t })
     }
 
-    accountFollow.AccountFollower = account
-    accountFollow.AccountFollowing = targetAccount
+    actorFollow.ActorFollower = actor
+    actorFollow.ActorFollowing = targetActor
+
+    // Target sends to actor he accepted the follow request
+    await sendAccept(actorFollow)
 
-    // Target sends to account he accepted the follow request
-    return sendAccept(accountFollow, t)
+    return { actorFollow, created }
   })
 
-  logger.info('Account uuid %s is followed by account %s.', account.url, targetAccountURL)
+  if (created) Notifier.Instance.notifyOfNewFollow(actorFollow)
+
+  logger.info('Actor %s is followed by actor %s.', targetActorURL, actor.url)
 }