import * as Bluebird from 'bluebird'
import * as validator from 'validator'
import { ResultList } from '../../shared/models'
-import { Activity, ActivityPubActor } from '../../shared/models/activitypub'
-import { ACTIVITY_PUB } from '../initializers'
+import { Activity } from '../../shared/models/activitypub'
+import { ACTIVITY_PUB } from '../initializers/constants'
import { ActorModel } from '../models/activitypub/actor'
import { signJsonLDObject } from './peertube-crypto'
import { pageToStartAndCount } from './core-utils'
+import { parse } from 'url'
+import { MActor } from '../typings/models'
function activityPubContextify <T> (data: T) {
return Object.assign(data, {
'https://w3id.org/security/v1',
{
RsaSignature2017: 'https://w3id.org/security#RsaSignature2017',
- pt: 'https://joinpeertube.org/ns',
+ pt: 'https://joinpeertube.org/ns#',
sc: 'http://schema.org#',
Hashtag: 'as:Hashtag',
uuid: 'sc:identifier',
subtitleLanguage: 'sc:subtitleLanguage',
sensitive: 'as:sensitive',
language: 'sc:inLanguage',
- views: 'sc:Number',
- stats: 'sc:Number',
- size: 'sc:Number',
- fps: 'sc:Number',
- commentsEnabled: 'sc:Boolean',
- waitTranscoding: 'sc:Boolean',
expires: 'sc:expires',
- support: 'sc:Text',
- CacheFile: 'pt:CacheFile'
+ CacheFile: 'pt:CacheFile',
+ Infohash: 'pt:Infohash',
+ originallyPublishedAt: 'sc:datePublished',
+ views: {
+ '@type': 'sc:Number',
+ '@id': 'pt:views'
+ },
+ state: {
+ '@type': 'sc:Number',
+ '@id': 'pt:state'
+ },
+ size: {
+ '@type': 'sc:Number',
+ '@id': 'pt:size'
+ },
+ fps: {
+ '@type': 'sc:Number',
+ '@id': 'pt:fps'
+ },
+ startTimestamp: {
+ '@type': 'sc:Number',
+ '@id': 'pt:startTimestamp'
+ },
+ stopTimestamp: {
+ '@type': 'sc:Number',
+ '@id': 'pt:stopTimestamp'
+ },
+ position: {
+ '@type': 'sc:Number',
+ '@id': 'pt:position'
+ },
+ commentsEnabled: {
+ '@type': 'sc:Boolean',
+ '@id': 'pt:commentsEnabled'
+ },
+ downloadEnabled: {
+ '@type': 'sc:Boolean',
+ '@id': 'pt:downloadEnabled'
+ },
+ waitTranscoding: {
+ '@type': 'sc:Boolean',
+ '@id': 'pt:waitTranscoding'
+ },
+ support: {
+ '@type': 'sc:Text',
+ '@id': 'pt:support'
+ }
},
{
likes: {
'@id': 'as:dislikes',
'@type': '@id'
},
+ playlists: {
+ '@id': 'pt:playlists',
+ '@type': '@id'
+ },
shares: {
'@id': 'as:shares',
'@type': '@id'
}
type ActivityPubCollectionPaginationHandler = (start: number, count: number) => Bluebird<ResultList<any>> | Promise<ResultList<any>>
-async function activityPubCollectionPagination (url: string, handler: ActivityPubCollectionPaginationHandler, page?: any) {
+async function activityPubCollectionPagination (baseUrl: string, handler: ActivityPubCollectionPaginationHandler, page?: any) {
if (!page || !validator.isInt(page)) {
// We just display the first page URL, we only need the total items
const result = await handler(0, 1)
return {
- id: url,
- type: 'OrderedCollection',
+ id: baseUrl,
+ type: 'OrderedCollectionPage',
totalItems: result.total,
- first: url + '?page=1'
+ first: baseUrl + '?page=1'
}
}
// There are more results
if (result.total > page * ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) {
- next = url + '?page=' + (page + 1)
+ next = baseUrl + '?page=' + (page + 1)
}
if (page > 1) {
- prev = url + '?page=' + (page - 1)
+ prev = baseUrl + '?page=' + (page - 1)
}
return {
- id: url + '?page=' + page,
+ id: baseUrl + '?page=' + page,
type: 'OrderedCollectionPage',
prev,
next,
- partOf: url,
+ partOf: baseUrl,
orderedItems: result.data,
totalItems: result.total
}
}
-function buildSignedActivity (byActor: ActorModel, data: Object) {
+function buildSignedActivity (byActor: MActor, data: Object) {
const activity = activityPubContextify(data)
return signJsonLDObject(byActor, activity) as Promise<Activity>
}
-function getActorUrl (activityActor: string | ActivityPubActor) {
- if (typeof activityActor === 'string') return activityActor
+function getAPId (activity: string | { id: string }) {
+ if (typeof activity === 'string') return activity
+
+ return activity.id
+}
+
+function checkUrlsSameHost (url1: string, url2: string) {
+ const idHost = parse(url1).host
+ const actorHost = parse(url2).host
- return activityActor.id
+ return idHost && actorHost && idHost.toLowerCase() === actorHost.toLowerCase()
}
// ---------------------------------------------------------------------------
export {
- getActorUrl,
+ checkUrlsSameHost,
+ getAPId,
activityPubContextify,
activityPubCollectionPagination,
buildSignedActivity