X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Factivitypub.ts;h=326785b680581fc4627a1b20a6bfd76151d86e7e;hb=590a3b1e3ce78ce6e872536d806304547953e26e;hp=e850efe138eb53a4097e4a1a4cd742f6a1f60c57;hpb=7519127b5cb44095f78f6bf4c51d4ebf2b7d5e88;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index e850efe13..326785b68 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -1,79 +1,131 @@
 import * as Bluebird from 'bluebird'
-import * as validator from 'validator'
+import validator from 'validator'
 import { ResultList } from '../../shared/models'
 import { Activity } from '../../shared/models/activitypub'
-import { ACTIVITY_PUB } from '../initializers'
-import { ActorModel } from '../models/activitypub/actor'
+import { ACTIVITY_PUB, REMOTE_SCHEME } from '../initializers/constants'
 import { signJsonLDObject } from './peertube-crypto'
 import { pageToStartAndCount } from './core-utils'
-import { parse } from 'url'
+import { URL } from 'url'
+import { MActor, MVideoAccountLight } from '../typings/models'
 
-function activityPubContextify <T> (data: T) {
-  return Object.assign(data, {
+export type ContextType = 'All' | 'View' | 'Announce'
+
+function activityPubContextify <T> (data: T, type: ContextType = 'All') {
+  const base = {
+    RsaSignature2017: 'https://w3id.org/security#RsaSignature2017'
+  }
+
+  if (type === 'All') {
+    Object.assign(base, {
+      pt: 'https://joinpeertube.org/ns#',
+      sc: 'http://schema.org#',
+      Hashtag: 'as:Hashtag',
+      uuid: 'sc:identifier',
+      category: 'sc:category',
+      licence: 'sc:license',
+      subtitleLanguage: 'sc:subtitleLanguage',
+      sensitive: 'as:sensitive',
+      language: 'sc:inLanguage',
+      expires: 'sc:expires',
+      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:likes',
+        '@type': '@id'
+      },
+      dislikes: {
+        '@id': 'as:dislikes',
+        '@type': '@id'
+      },
+      playlists: {
+        '@id': 'pt:playlists',
+        '@type': '@id'
+      },
+      shares: {
+        '@id': 'as:shares',
+        '@type': '@id'
+      },
+      comments: {
+        '@id': 'as:comments',
+        '@type': '@id'
+      }
+    })
+  }
+
+  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#',
-        Hashtag: 'as:Hashtag',
-        uuid: 'sc:identifier',
-        category: 'sc:category',
-        licence: 'sc:license',
-        subtitleLanguage: 'sc:subtitleLanguage',
-        sensitive: 'as:sensitive',
-        language: 'sc:inLanguage',
-        views: 'sc:Number',
-        state: 'sc:Number',
-        size: 'sc:Number',
-        fps: 'sc:Number',
-        commentsEnabled: 'sc:Boolean',
-        downloadEnabled: 'sc:Boolean',
-        waitTranscoding: 'sc:Boolean',
-        expires: 'sc:expires',
-        support: 'sc:Text',
-        CacheFile: 'pt:CacheFile',
-        Infohash: 'pt:Infohash',
-        originallyPublishedAt: 'sc:DateTime'
-      },
-      {
-        likes: {
-          '@id': 'as:likes',
-          '@type': '@id'
-        },
-        dislikes: {
-          '@id': 'as:dislikes',
-          '@type': '@id'
-        },
-        shares: {
-          '@id': 'as:shares',
-          '@type': '@id'
-        },
-        comments: {
-          '@id': 'as:comments',
-          '@type': '@id'
-        }
-      }
+      base
     ]
   })
 }
 
 type ActivityPubCollectionPaginationHandler = (start: number, count: number) => Bluebird<ResultList<any>> | Promise<ResultList<any>>
-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)
 
     return {
       id: baseUrl,
-      type: 'OrderedCollection',
+      type: 'OrderedCollectionPage',
       totalItems: result.total,
       first: baseUrl + '?page=1'
     }
   }
 
-  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
@@ -83,7 +135,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)
   }
 
@@ -103,8 +155,8 @@ async function activityPubCollectionPagination (baseUrl: string, handler: Activi
 
 }
 
-function buildSignedActivity (byActor: ActorModel, data: Object) {
-  const activity = activityPubContextify(data)
+function buildSignedActivity (byActor: MActor, data: Object, contextType?: ContextType) {
+  const activity = activityPubContextify(data, contextType)
 
   return signJsonLDObject(byActor, activity) as Promise<Activity>
 }
@@ -116,12 +168,18 @@ function getAPId (activity: string | { id: string }) {
 }
 
 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: MVideoAccountLight, path: string) {
+  const host = video.VideoChannel.Account.Actor.Server.host
+
+  return REMOTE_SCHEME.HTTP + '://' + host + path
+}
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -129,5 +187,6 @@ export {
   getAPId,
   activityPubContextify,
   activityPubCollectionPagination,
-  buildSignedActivity
+  buildSignedActivity,
+  buildRemoteVideoBaseUrl
 }