diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/helpers/activitypub.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'server/helpers/activitypub.ts')
| -rw-r--r-- | server/helpers/activitypub.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index 79b76fa0b..f1430055f 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts | |||
| @@ -106,7 +106,7 @@ function buildSignedActivity (byActor: ActorModel, data: Object) { | |||
| 106 | return signJsonLDObject(byActor, activity) as Promise<Activity> | 106 | return signJsonLDObject(byActor, activity) as Promise<Activity> |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | function getAPUrl (activity: string | { id: string }) { | 109 | function getAPId (activity: string | { id: string }) { |
| 110 | if (typeof activity === 'string') return activity | 110 | if (typeof activity === 'string') return activity |
| 111 | 111 | ||
| 112 | return activity.id | 112 | return activity.id |
| @@ -123,7 +123,7 @@ function checkUrlsSameHost (url1: string, url2: string) { | |||
| 123 | 123 | ||
| 124 | export { | 124 | export { |
| 125 | checkUrlsSameHost, | 125 | checkUrlsSameHost, |
| 126 | getAPUrl, | 126 | getAPId, |
| 127 | activityPubContextify, | 127 | activityPubContextify, |
| 128 | activityPubCollectionPagination, | 128 | activityPubCollectionPagination, |
| 129 | buildSignedActivity | 129 | buildSignedActivity |