diff options
Diffstat (limited to 'server/helpers/activitypub.ts')
-rw-r--r-- | server/helpers/activitypub.ts | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index 1304c7559..278010e78 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts | |||
@@ -4,7 +4,7 @@ import { ResultList } from '../../shared/models' | |||
4 | import { Activity, ActivityPubActor } from '../../shared/models/activitypub' | 4 | import { Activity, ActivityPubActor } from '../../shared/models/activitypub' |
5 | import { ACTIVITY_PUB } from '../initializers' | 5 | import { ACTIVITY_PUB } from '../initializers' |
6 | import { ActorModel } from '../models/activitypub/actor' | 6 | import { ActorModel } from '../models/activitypub/actor' |
7 | import { signObject } from './peertube-crypto' | 7 | import { signJsonLDObject } from './peertube-crypto' |
8 | import { pageToStartAndCount } from './core-utils' | 8 | import { pageToStartAndCount } from './core-utils' |
9 | 9 | ||
10 | function activityPubContextify <T> (data: T) { | 10 | function activityPubContextify <T> (data: T) { |
@@ -15,22 +15,22 @@ function activityPubContextify <T> (data: T) { | |||
15 | { | 15 | { |
16 | RsaSignature2017: 'https://w3id.org/security#RsaSignature2017', | 16 | RsaSignature2017: 'https://w3id.org/security#RsaSignature2017', |
17 | pt: 'https://joinpeertube.org/ns', | 17 | pt: 'https://joinpeertube.org/ns', |
18 | schema: 'http://schema.org#', | 18 | sc: 'http://schema.org#', |
19 | Hashtag: 'as:Hashtag', | 19 | Hashtag: 'as:Hashtag', |
20 | uuid: 'schema:identifier', | 20 | uuid: 'sc:identifier', |
21 | category: 'schema:category', | 21 | category: 'sc:category', |
22 | licence: 'schema:license', | 22 | licence: 'sc:license', |
23 | subtitleLanguage: 'schema:subtitleLanguage', | 23 | subtitleLanguage: 'sc:subtitleLanguage', |
24 | sensitive: 'as:sensitive', | 24 | sensitive: 'as:sensitive', |
25 | language: 'schema:inLanguage', | 25 | language: 'sc:inLanguage', |
26 | views: 'schema:Number', | 26 | views: 'sc:Number', |
27 | stats: 'schema:Number', | 27 | stats: 'sc:Number', |
28 | size: 'schema:Number', | 28 | size: 'sc:Number', |
29 | fps: 'schema:Number', | 29 | fps: 'sc:Number', |
30 | commentsEnabled: 'schema:Boolean', | 30 | commentsEnabled: 'sc:Boolean', |
31 | waitTranscoding: 'schema:Boolean', | 31 | waitTranscoding: 'sc:Boolean', |
32 | expires: 'schema:expires', | 32 | expires: 'sc:expires', |
33 | support: 'schema:Text', | 33 | support: 'sc:Text', |
34 | CacheFile: 'pt:CacheFile' | 34 | CacheFile: 'pt:CacheFile' |
35 | }, | 35 | }, |
36 | { | 36 | { |
@@ -102,7 +102,7 @@ async function activityPubCollectionPagination (url: string, handler: ActivityPu | |||
102 | function buildSignedActivity (byActor: ActorModel, data: Object) { | 102 | function buildSignedActivity (byActor: ActorModel, data: Object) { |
103 | const activity = activityPubContextify(data) | 103 | const activity = activityPubContextify(data) |
104 | 104 | ||
105 | return signObject(byActor, activity) as Promise<Activity> | 105 | return signJsonLDObject(byActor, activity) as Promise<Activity> |
106 | } | 106 | } |
107 | 107 | ||
108 | function getActorUrl (activityActor: string | ActivityPubActor) { | 108 | function getActorUrl (activityActor: string | ActivityPubActor) { |