diff options
author | Chocobozzz <me@florianbigard.com> | 2017-12-19 10:34:56 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2017-12-19 10:53:16 +0100 |
commit | e12a009254de33bcdbd8334992980fa029c3e10d (patch) | |
tree | 85c6b576d9f76fee33b22e1fdbdca5e9daa24d50 /server/lib/activitypub/send/send-accept.ts | |
parent | ce33ee01cd3806201b676c318e9aa930032921b2 (diff) | |
download | PeerTube-e12a009254de33bcdbd8334992980fa029c3e10d.tar.gz PeerTube-e12a009254de33bcdbd8334992980fa029c3e10d.tar.zst PeerTube-e12a009254de33bcdbd8334992980fa029c3e10d.zip |
Status are sent to mastodon
Diffstat (limited to 'server/lib/activitypub/send/send-accept.ts')
-rw-r--r-- | server/lib/activitypub/send/send-accept.ts | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/server/lib/activitypub/send/send-accept.ts b/server/lib/activitypub/send/send-accept.ts index 7579884a7..4eaa329d9 100644 --- a/server/lib/activitypub/send/send-accept.ts +++ b/server/lib/activitypub/send/send-accept.ts | |||
@@ -1,16 +1,20 @@ | |||
1 | import { Transaction } from 'sequelize' | 1 | import { Transaction } from 'sequelize' |
2 | import { ActivityAccept } from '../../../../shared/models/activitypub' | 2 | import { ActivityAccept, ActivityFollow } from '../../../../shared/models/activitypub' |
3 | import { ActorModel } from '../../../models/activitypub/actor' | 3 | import { ActorModel } from '../../../models/activitypub/actor' |
4 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | 4 | import { ActorFollowModel } from '../../../models/activitypub/actor-follow' |
5 | import { getActorFollowAcceptActivityPubUrl } from '../url' | 5 | import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url' |
6 | import { unicastTo } from './misc' | 6 | import { unicastTo } from './misc' |
7 | import { followActivityData } from './send-follow' | ||
7 | 8 | ||
8 | async function sendAccept (actorFollow: ActorFollowModel, t: Transaction) { | 9 | async function sendAccept (actorFollow: ActorFollowModel, t: Transaction) { |
9 | const follower = actorFollow.ActorFollower | 10 | const follower = actorFollow.ActorFollower |
10 | const me = actorFollow.ActorFollowing | 11 | const me = actorFollow.ActorFollowing |
11 | 12 | ||
13 | const followUrl = getActorFollowActivityPubUrl(actorFollow) | ||
14 | const followData = followActivityData(followUrl, follower, me) | ||
15 | |||
12 | const url = getActorFollowAcceptActivityPubUrl(actorFollow) | 16 | const url = getActorFollowAcceptActivityPubUrl(actorFollow) |
13 | const data = acceptActivityData(url, me) | 17 | const data = acceptActivityData(url, me, followData) |
14 | 18 | ||
15 | return unicastTo(data, me, follower.inboxUrl, t) | 19 | return unicastTo(data, me, follower.inboxUrl, t) |
16 | } | 20 | } |
@@ -23,10 +27,11 @@ export { | |||
23 | 27 | ||
24 | // --------------------------------------------------------------------------- | 28 | // --------------------------------------------------------------------------- |
25 | 29 | ||
26 | function acceptActivityData (url: string, byActor: ActorModel): ActivityAccept { | 30 | function acceptActivityData (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityAccept { |
27 | return { | 31 | return { |
28 | type: 'Accept', | 32 | type: 'Accept', |
29 | id: url, | 33 | id: url, |
30 | actor: byActor.url | 34 | actor: byActor.url, |
35 | object: followActivityData | ||
31 | } | 36 | } |
32 | } | 37 | } |