X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-accept.ts;h=bb387e2c0e2b65ceab254bba2ef48868b180897d;hb=4d7ce9218a3f695bf3d013cbdce1c5c6a5221927;hp=dfee1ec3e9bf255d95f56740cca996623590bd0e;hpb=8e0fd45e14993793c64e06682a4a05c29068d398;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/send/send-accept.ts b/server/lib/activitypub/send/send-accept.ts
index dfee1ec3e..bb387e2c0 100644
--- a/server/lib/activitypub/send/send-accept.ts
+++ b/server/lib/activitypub/send/send-accept.ts
@@ -1,22 +1,25 @@
 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
 
+  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)
 
-  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)
 }
@@ -29,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,