Merge branch 'release/2.1.0' into develop

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

diff --git a/server/lib/activitypub/send/send-accept.ts b/server/lib/activitypub/send/send-accept.ts
index eeab19ed01c59c94384bfa4751c35444dfe83207..c4c6b849b9e3340dc15060e23795958c47ac9654 100644 (file)
--- a/server/lib/activitypub/send/send-accept.ts
+++ b/server/lib/activitypub/send/send-accept.ts
@@ -1,18 +1,28 @@
-import { Transaction } from 'sequelize'
-import { ActivityAccept } from '../../../../shared/models/activitypub/activity'
-import { AccountInstance } from '../../../models'
-import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
-import { unicastTo } from './misc'
-import { getAccountFollowAcceptActivityPubUrl } from '../url'
+import { ActivityAccept, ActivityFollow } from '../../../../shared/models/activitypub'
+import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
+import { unicastTo } from './utils'
+import { buildFollowActivity } from './send-follow'
+import { logger } from '../../../helpers/logger'
+import { MActor, MActorFollowActors } from '../../../typings/models'
+
+function sendAccept (actorFollow: MActorFollowActors) {
+  const follower = actorFollow.ActorFollower
+  const me = actorFollow.ActorFollowing
+
+  if (!follower.serverId) { // This should never happen
+    logger.warn('Do not sending accept to local follower.')
+    return
+  }
+
+  logger.info('Creating job to accept follower %s.', follower.url)
 
-async function sendAccept (accountFollow: AccountFollowInstance, t: Transaction) {
-  const follower = accountFollow.AccountFollower
-  const me = accountFollow.AccountFollowing
+  const followUrl = getActorFollowActivityPubUrl(follower, me)
+  const followData = buildFollowActivity(followUrl, follower, me)
 
-  const url = getAccountFollowAcceptActivityPubUrl(accountFollow)
-  const data = await acceptActivityData(url, me)
+  const url = getActorFollowAcceptActivityPubUrl(actorFollow)
+  const data = buildAcceptActivity(url, me, followData)
 
-  return unicastTo(data, me, follower.inboxUrl, t)
+  return unicastTo(data, me, follower.inboxUrl)
 }
 
 // ---------------------------------------------------------------------------
@@ -23,12 +33,11 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function acceptActivityData (url: string, byAccount: AccountInstance) {
-  const activity: ActivityAccept = {
+function buildAcceptActivity (url: string, byActor: MActor, followActivityData: ActivityFollow): ActivityAccept {
+  return {
     type: 'Accept',
     id: url,
-    actor: byAccount.url
+    actor: byActor.url,
+    object: followActivityData
   }
-
-  return activity
 }