X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Factivitypub.ts;h=fe721cbac1f01e351d157dd8a7d965c45ffd8c1d;hb=21d68e68039a1eefbe6213fbde46e737e520ee7d;hp=951a25669d4e2efb3e079c0cf7f9a748f63b0921;hpb=74dc3bca2b14f5fd3fe80c394dfc34177a46db77;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index 951a25669..fe721cbac 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts @@ -1,22 +1,35 @@ -import * as Bluebird from 'bluebird' -import * as validator from 'validator' +import Bluebird from 'bluebird' +import { URL } from 'url' +import validator from 'validator' +import { ContextType } from '@shared/models/activitypub/context' import { ResultList } from '../../shared/models' -import { Activity } from '../../shared/models/activitypub' -import { ACTIVITY_PUB } from '../initializers/constants' -import { ActorModel } from '../models/activitypub/actor' -import { signJsonLDObject } from './peertube-crypto' +import { ACTIVITY_PUB, REMOTE_SCHEME } from '../initializers/constants' +import { MActor, MVideoWithHost } from '../types/models' import { pageToStartAndCount } from './core-utils' -import { parse } from 'url' - -function activityPubContextify (data: T) { - return Object.assign(data, { - '@context': [ - 'https://www.w3.org/ns/activitystreams', - 'https://w3id.org/security/v1', - { - RsaSignature2017: 'https://w3id.org/security#RsaSignature2017', - pt: 'https://joinpeertube.org/ns#', - sc: 'http://schema.org#', +import { signJsonLDObject } from './peertube-crypto' + +function getContextData (type: ContextType) { + const context: any[] = [ + 'https://www.w3.org/ns/activitystreams', + 'https://w3id.org/security/v1', + { + RsaSignature2017: 'https://w3id.org/security#RsaSignature2017' + } + ] + + if (type !== 'View' && type !== 'Announce') { + const additional = { + pt: 'https://joinpeertube.org/ns#', + sc: 'http://schema.org#' + } + + if (type === 'CacheFile') { + Object.assign(additional, { + expires: 'sc:expires', + CacheFile: 'pt:CacheFile' + }) + } else { + Object.assign(additional, { Hashtag: 'as:Hashtag', uuid: 'sc:identifier', category: 'sc:category', @@ -24,9 +37,21 @@ function activityPubContextify (data: T) { subtitleLanguage: 'sc:subtitleLanguage', sensitive: 'as:sensitive', language: 'sc:inLanguage', - expires: 'sc:expires', - CacheFile: 'pt:CacheFile', + + isLiveBroadcast: 'sc:isLiveBroadcast', + liveSaveReplay: { + '@type': 'sc:Boolean', + '@id': 'pt:liveSaveReplay' + }, + permanentLive: { + '@type': 'sc:Boolean', + '@id': 'pt:permanentLive' + }, + Infohash: 'pt:Infohash', + Playlist: 'pt:Playlist', + PlaylistElement: 'pt:PlaylistElement', + originallyPublishedAt: 'sc:datePublished', views: { '@type': 'sc:Number', @@ -71,9 +96,7 @@ function activityPubContextify (data: T) { support: { '@type': 'sc:Text', '@id': 'pt:support' - } - }, - { + }, likes: { '@id': 'as:likes', '@type': '@id' @@ -94,13 +117,28 @@ function activityPubContextify (data: T) { '@id': 'as:comments', '@type': '@id' } - } - ] - }) + }) + } + + context.push(additional) + } + + return { + '@context': context + } +} + +function activityPubContextify (data: T, type: ContextType = 'All') { + return Object.assign({}, data, getContextData(type)) } type ActivityPubCollectionPaginationHandler = (start: number, count: number) => Bluebird> | Promise> -async function activityPubCollectionPagination (baseUrl: string, handler: ActivityPubCollectionPaginationHandler, page?: any) { +async function activityPubCollectionPagination ( + baseUrl: string, + handler: ActivityPubCollectionPaginationHandler, + page?: any, + size = ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE +) { if (!page || !validator.isInt(page)) { // We just display the first page URL, we only need the total items const result = await handler(0, 1) @@ -113,7 +151,7 @@ async function activityPubCollectionPagination (baseUrl: string, handler: Activi } } - const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) + const { start, count } = pageToStartAndCount(page, size) const result = await handler(start, count) let next: string | undefined @@ -123,7 +161,7 @@ async function activityPubCollectionPagination (baseUrl: string, handler: Activi page = parseInt(page, 10) // There are more results - if (result.total > page * ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) { + if (result.total > page * size) { next = baseUrl + '?page=' + (page + 1) } @@ -143,25 +181,33 @@ async function activityPubCollectionPagination (baseUrl: string, handler: Activi } -function buildSignedActivity (byActor: ActorModel, data: Object) { - const activity = activityPubContextify(data) +function buildSignedActivity (byActor: MActor, data: T, contextType?: ContextType) { + const activity = activityPubContextify(data, contextType) - return signJsonLDObject(byActor, activity) as Promise + return signJsonLDObject(byActor, activity) } -function getAPId (activity: string | { id: string }) { - if (typeof activity === 'string') return activity +function getAPId (object: string | { id: string }) { + if (typeof object === 'string') return object - return activity.id + return object.id } function checkUrlsSameHost (url1: string, url2: string) { - const idHost = parse(url1).host - const actorHost = parse(url2).host + const idHost = new URL(url1).host + const actorHost = new URL(url2).host return idHost && actorHost && idHost.toLowerCase() === actorHost.toLowerCase() } +function buildRemoteVideoBaseUrl (video: MVideoWithHost, path: string, scheme?: string) { + if (!scheme) scheme = REMOTE_SCHEME.HTTP + + const host = video.VideoChannel.Actor.Server.host + + return scheme + '://' + host + path +} + // --------------------------------------------------------------------------- export { @@ -169,5 +215,6 @@ export { getAPId, activityPubContextify, activityPubCollectionPagination, - buildSignedActivity + buildSignedActivity, + buildRemoteVideoBaseUrl }