diff options
Diffstat (limited to 'server/lib/activitypub/send')
-rw-r--r-- | server/lib/activitypub/send/send-accept.ts | 2 | ||||
-rw-r--r-- | server/lib/activitypub/send/send-follow.ts | 2 | ||||
-rw-r--r-- | server/lib/activitypub/send/send-reject.ts | 18 | ||||
-rw-r--r-- | server/lib/activitypub/send/send-undo.ts | 2 |
4 files changed, 10 insertions, 14 deletions
diff --git a/server/lib/activitypub/send/send-accept.ts b/server/lib/activitypub/send/send-accept.ts index b6abde13d..388a9ed23 100644 --- a/server/lib/activitypub/send/send-accept.ts +++ b/server/lib/activitypub/send/send-accept.ts | |||
@@ -17,7 +17,7 @@ async function sendAccept (actorFollow: ActorFollowModel) { | |||
17 | 17 | ||
18 | logger.info('Creating job to accept follower %s.', follower.url) | 18 | logger.info('Creating job to accept follower %s.', follower.url) |
19 | 19 | ||
20 | const followUrl = getActorFollowActivityPubUrl(actorFollow) | 20 | const followUrl = getActorFollowActivityPubUrl(follower, me) |
21 | const followData = buildFollowActivity(followUrl, follower, me) | 21 | const followData = buildFollowActivity(followUrl, follower, me) |
22 | 22 | ||
23 | const url = getActorFollowAcceptActivityPubUrl(actorFollow) | 23 | const url = getActorFollowAcceptActivityPubUrl(actorFollow) |
diff --git a/server/lib/activitypub/send/send-follow.ts b/server/lib/activitypub/send/send-follow.ts index 170b46b48..2c3d02014 100644 --- a/server/lib/activitypub/send/send-follow.ts +++ b/server/lib/activitypub/send/send-follow.ts | |||
@@ -14,7 +14,7 @@ function sendFollow (actorFollow: ActorFollowModel) { | |||
14 | 14 | ||
15 | logger.info('Creating job to send follow request to %s.', following.url) | 15 | logger.info('Creating job to send follow request to %s.', following.url) |
16 | 16 | ||
17 | const url = getActorFollowActivityPubUrl(actorFollow) | 17 | const url = getActorFollowActivityPubUrl(me, following) |
18 | const data = buildFollowActivity(url, me, following) | 18 | const data = buildFollowActivity(url, me, following) |
19 | 19 | ||
20 | return unicastTo(data, me, following.inboxUrl) | 20 | return unicastTo(data, me, following.inboxUrl) |
diff --git a/server/lib/activitypub/send/send-reject.ts b/server/lib/activitypub/send/send-reject.ts index db8c2d86d..bac7ff556 100644 --- a/server/lib/activitypub/send/send-reject.ts +++ b/server/lib/activitypub/send/send-reject.ts | |||
@@ -1,15 +1,11 @@ | |||
1 | import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub' | 1 | import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub' |
2 | import { ActorModel } from '../../../models/activitypub/actor' | 2 | import { ActorModel } from '../../../models/activitypub/actor' |
3 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | 3 | import { getActorFollowActivityPubUrl, getActorFollowRejectActivityPubUrl } from '../url' |
4 | import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url' | ||
5 | import { unicastTo } from './utils' | 4 | import { unicastTo } from './utils' |
6 | import { buildFollowActivity } from './send-follow' | 5 | import { buildFollowActivity } from './send-follow' |
7 | import { logger } from '../../../helpers/logger' | 6 | import { logger } from '../../../helpers/logger' |
8 | 7 | ||
9 | async function sendReject (actorFollow: ActorFollowModel) { | 8 | async function sendReject (follower: ActorModel, following: ActorModel) { |
10 | const follower = actorFollow.ActorFollower | ||
11 | const me = actorFollow.ActorFollowing | ||
12 | |||
13 | if (!follower.serverId) { // This should never happen | 9 | if (!follower.serverId) { // This should never happen |
14 | logger.warn('Do not sending reject to local follower.') | 10 | logger.warn('Do not sending reject to local follower.') |
15 | return | 11 | return |
@@ -17,13 +13,13 @@ async function sendReject (actorFollow: ActorFollowModel) { | |||
17 | 13 | ||
18 | logger.info('Creating job to reject follower %s.', follower.url) | 14 | logger.info('Creating job to reject follower %s.', follower.url) |
19 | 15 | ||
20 | const followUrl = getActorFollowActivityPubUrl(actorFollow) | 16 | const followUrl = getActorFollowActivityPubUrl(follower, following) |
21 | const followData = buildFollowActivity(followUrl, follower, me) | 17 | const followData = buildFollowActivity(followUrl, follower, following) |
22 | 18 | ||
23 | const url = getActorFollowAcceptActivityPubUrl(actorFollow) | 19 | const url = getActorFollowRejectActivityPubUrl(follower, following) |
24 | const data = buildRejectActivity(url, me, followData) | 20 | const data = buildRejectActivity(url, following, followData) |
25 | 21 | ||
26 | return unicastTo(data, me, follower.inboxUrl) | 22 | return unicastTo(data, following, follower.inboxUrl) |
27 | } | 23 | } |
28 | 24 | ||
29 | // --------------------------------------------------------------------------- | 25 | // --------------------------------------------------------------------------- |
diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts index ecbf605d6..8727a121e 100644 --- a/server/lib/activitypub/send/send-undo.ts +++ b/server/lib/activitypub/send/send-undo.ts | |||
@@ -31,7 +31,7 @@ async function sendUndoFollow (actorFollow: ActorFollowModel, t: Transaction) { | |||
31 | 31 | ||
32 | logger.info('Creating job to send an unfollow request to %s.', following.url) | 32 | logger.info('Creating job to send an unfollow request to %s.', following.url) |
33 | 33 | ||
34 | const followUrl = getActorFollowActivityPubUrl(actorFollow) | 34 | const followUrl = getActorFollowActivityPubUrl(me, following) |
35 | const undoUrl = getUndoActivityPubUrl(followUrl) | 35 | const undoUrl = getUndoActivityPubUrl(followUrl) |
36 | 36 | ||
37 | const followActivity = buildFollowActivity(followUrl, me, following) | 37 | const followActivity = buildFollowActivity(followUrl, me, following) |