Merge branch 'release/3.2.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 ef679707bfe72df3d9332f531e8ee6691da53d2a..bb387e2c0e2b65ceab254bba2ef48868b180897d 100644 (file)
--- a/server/lib/activitypub/send/send-accept.ts
+++ b/server/lib/activitypub/send/send-accept.ts
@@ -1,12 +1,11 @@
 import { ActivityAccept, ActivityFollow } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
-import { unicastTo } from './utils'
-import { followActivityData } from './send-follow'
 import { logger } from '../../../helpers/logger'
+import { MActor, MActorFollowActors } from '../../../types/models'
+import { getLocalActorFollowAcceptActivityPubUrl } from '../url'
+import { buildFollowActivity } from './send-follow'
+import { unicastTo } from './utils'
 
-async function sendAccept (actorFollow: ActorFollowModel) {
+function sendAccept (actorFollow: MActorFollowActors) {
   const follower = actorFollow.ActorFollower
   const me = actorFollow.ActorFollowing
 
@@ -17,11 +16,10 @@ async function sendAccept (actorFollow: ActorFollowModel) {
 
   logger.info('Creating job to accept follower %s.', follower.url)
 
-  const followUrl = getActorFollowActivityPubUrl(actorFollow)
-  const followData = followActivityData(followUrl, follower, me)
+  const followData = buildFollowActivity(actorFollow.url, follower, me)
 
-  const url = getActorFollowAcceptActivityPubUrl(actorFollow)
-  const data = acceptActivityData(url, me, followData)
+  const url = getLocalActorFollowAcceptActivityPubUrl(actorFollow)
+  const data = buildAcceptActivity(url, me, followData)
 
   return unicastTo(data, me, follower.inboxUrl)
 }
@@ -34,7 +32,7 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function acceptActivityData (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityAccept {
+function buildAcceptActivity (url: string, byActor: MActor, followActivityData: ActivityFollow): ActivityAccept {
   return {
     type: 'Accept',
     id: url,