mirror of https://github.com/Chocobozzz/PeerTube
Use unique AP id for accept/reject
This commit is contained in:
parent
051d69a005
commit
9e2a4af3a0
|
@ -15,7 +15,7 @@ function sendReject (followUrl: string, follower: MActor, following: MActor) {
|
||||||
|
|
||||||
const followData = buildFollowActivity(followUrl, follower, following)
|
const followData = buildFollowActivity(followUrl, follower, following)
|
||||||
|
|
||||||
const url = getLocalActorFollowRejectActivityPubUrl(follower, following)
|
const url = getLocalActorFollowRejectActivityPubUrl()
|
||||||
const data = buildRejectActivity(url, following, followData)
|
const data = buildRejectActivity(url, following, followData)
|
||||||
|
|
||||||
return unicastTo({ data, byActor: following, toActorUrl: follower.inboxUrl, contextType: 'Reject' })
|
return unicastTo({ data, byActor: following, toActorUrl: follower.inboxUrl, contextType: 'Reject' })
|
||||||
|
|
|
@ -93,14 +93,11 @@ function getLocalActorFollowActivityPubUrl (follower: MActor, following: MActorI
|
||||||
}
|
}
|
||||||
|
|
||||||
function getLocalActorFollowAcceptActivityPubUrl (actorFollow: MActorFollowActors) {
|
function getLocalActorFollowAcceptActivityPubUrl (actorFollow: MActorFollowActors) {
|
||||||
const follower = actorFollow.ActorFollower
|
return WEBSERVER.URL + '/accepts/follows/' + actorFollow.id
|
||||||
const me = actorFollow.ActorFollowing
|
|
||||||
|
|
||||||
return WEBSERVER.URL + '/accepts/follows/' + follower.id + '/' + me.id
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function getLocalActorFollowRejectActivityPubUrl (follower: MActorId, following: MActorId) {
|
function getLocalActorFollowRejectActivityPubUrl () {
|
||||||
return WEBSERVER.URL + '/rejects/follows/' + follower.id + '/' + following.id
|
return WEBSERVER.URL + '/rejects/follows/' + new Date().toISOString()
|
||||||
}
|
}
|
||||||
|
|
||||||
function getLocalVideoAnnounceActivityPubUrl (byActor: MActorId, video: MVideoUrl) {
|
function getLocalVideoAnnounceActivityPubUrl (byActor: MActorId, video: MVideoUrl) {
|
||||||
|
|
Loading…
Reference in New Issue