yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Fix incorrect IDs in AP federation

Browse source
This commit is contained in:
Chocobozzz 2020-11-20 11:21:08 +01:00
parent 3fba4b6bce
commit de94ac86a2
No known key found for this signature in database
GPG key ID: 583A612D890159BE
34 changed files with 281 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/lib/activitypub/send/send-accept.ts
View file

@ -1,9 +1,9 @@
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 '../../../types/models'
import { getLocalActorFollowAcceptActivityPubUrl } from '../url'
import { buildFollowActivity } from './send-follow'
import { unicastTo } from './utils'
function sendAccept (actorFollow: MActorFollowActors) {
const follower = actorFollow.ActorFollower
@ -16,10 +16,9 @@ function sendAccept (actorFollow: MActorFollowActors) {
logger.info('Creating job to accept follower %s.', follower.url)
const followUrl = getActorFollowActivityPubUrl(follower, me)
const followData = buildFollowActivity(followUrl, follower, me)
const followData = buildFollowActivity(actorFollow.url, follower, me)
const url = getActorFollowAcceptActivityPubUrl(actorFollow)
const url = getLocalActorFollowAcceptActivityPubUrl(actorFollow)
const data = buildAcceptActivity(url, me, followData)
return unicastTo(data, me, follower.inboxUrl)