diff options
Diffstat (limited to 'server/lib/activitypub/url.ts')
-rw-r--r-- | server/lib/activitypub/url.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/lib/activitypub/url.ts b/server/lib/activitypub/url.ts index 7c2ee5bc6..401b83fc2 100644 --- a/server/lib/activitypub/url.ts +++ b/server/lib/activitypub/url.ts | |||
@@ -74,11 +74,8 @@ function getVideoDislikesActivityPubUrl (video: VideoModel) { | |||
74 | return video.url + '/dislikes' | 74 | return video.url + '/dislikes' |
75 | } | 75 | } |
76 | 76 | ||
77 | function getActorFollowActivityPubUrl (actorFollow: ActorFollowModel) { | 77 | function getActorFollowActivityPubUrl (follower: ActorModel, following: ActorModel) { |
78 | const me = actorFollow.ActorFollower | 78 | return follower.url + '/follows/' + following.id |
79 | const following = actorFollow.ActorFollowing | ||
80 | |||
81 | return me.url + '/follows/' + following.id | ||
82 | } | 79 | } |
83 | 80 | ||
84 | function getActorFollowAcceptActivityPubUrl (actorFollow: ActorFollowModel) { | 81 | function getActorFollowAcceptActivityPubUrl (actorFollow: ActorFollowModel) { |
@@ -88,6 +85,10 @@ function getActorFollowAcceptActivityPubUrl (actorFollow: ActorFollowModel) { | |||
88 | return follower.url + '/accepts/follows/' + me.id | 85 | return follower.url + '/accepts/follows/' + me.id |
89 | } | 86 | } |
90 | 87 | ||
88 | function getActorFollowRejectActivityPubUrl (follower: ActorModel, following: ActorModel) { | ||
89 | return follower.url + '/rejects/follows/' + following.id | ||
90 | } | ||
91 | |||
91 | function getVideoAnnounceActivityPubUrl (byActor: ActorModel, video: VideoModel) { | 92 | function getVideoAnnounceActivityPubUrl (byActor: ActorModel, video: VideoModel) { |
92 | return video.url + '/announces/' + byActor.id | 93 | return video.url + '/announces/' + byActor.id |
93 | } | 94 | } |
@@ -120,6 +121,7 @@ export { | |||
120 | getVideoViewActivityPubUrl, | 121 | getVideoViewActivityPubUrl, |
121 | getVideoLikeActivityPubUrl, | 122 | getVideoLikeActivityPubUrl, |
122 | getVideoDislikeActivityPubUrl, | 123 | getVideoDislikeActivityPubUrl, |
124 | getActorFollowRejectActivityPubUrl, | ||
123 | getVideoCommentActivityPubUrl, | 125 | getVideoCommentActivityPubUrl, |
124 | getDeleteActivityPubUrl, | 126 | getDeleteActivityPubUrl, |
125 | getVideoSharesActivityPubUrl, | 127 | getVideoSharesActivityPubUrl, |