Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / send / send-follow.ts

diff --git a/server/lib/activitypub/send/send-follow.ts b/server/lib/activitypub/send/send-follow.ts
index 51735ddfd0599569b4079c722b5cff27f2602f71..9219640ddaae85cb8733e5c5ff6d44d7a78b02ca 100644 (file)
--- a/server/lib/activitypub/send/send-follow.ts
+++ b/server/lib/activitypub/send/send-follow.ts
@@ -1,26 +1,29 @@
 import { Transaction } from 'sequelize'
 import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { AccountModel } from '../../../models/account/account'
-import { AccountFollowModel } from '../../../models/account/account-follow'
-import { getAccountFollowActivityPubUrl } from '../url'
-import { unicastTo } from './misc'
+import { logger } from '../../../helpers/logger'
+import { MActor, MActorFollowActors } from '../../../types/models'
+import { unicastTo } from './utils'
 
-function sendFollow (accountFollow: AccountFollowModel, t: Transaction) {
-  const me = accountFollow.AccountFollower
-  const following = accountFollow.AccountFollowing
+function sendFollow (actorFollow: MActorFollowActors, t: Transaction) {
+  const me = actorFollow.ActorFollower
+  const following = actorFollow.ActorFollowing
 
-  const url = getAccountFollowActivityPubUrl(accountFollow)
-  const data = followActivityData(url, me, following)
+  // Same server as ours
+  if (!following.serverId) return
 
-  return unicastTo(data, me, following.inboxUrl, t)
+  logger.info('Creating job to send follow request to %s.', following.url)
+
+  const data = buildFollowActivity(actorFollow.url, me, following)
+
+  t.afterCommit(() => unicastTo(data, me, following.inboxUrl))
 }
 
-function followActivityData (url: string, byAccount: AccountModel, targetAccount: AccountModel): ActivityFollow {
+function buildFollowActivity (url: string, byActor: MActor, targetActor: MActor): ActivityFollow {
   return {
     type: 'Follow',
     id: url,
-    actor: byAccount.url,
-    object: targetAccount.url
+    actor: byActor.url,
+    object: targetActor.url
   }
 }
 
@@ -28,5 +31,5 @@ function followActivityData (url: string, byAccount: AccountModel, targetAccount
 
 export {
   sendFollow,
-  followActivityData
+  buildFollowActivity
 }