X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Factivitypub.ts;h=08aef29083dbb14a3753cf121b41f6d1c4dae275;hb=1dae95d7e2405c7b819daa24acde8ac5a754baf5;hp=326785b680581fc4627a1b20a6bfd76151d86e7e;hpb=7cd1b12c19d0589d1d692ed0571ca0800f028aea;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index 326785b68..08aef2908 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -1,109 +1,136 @@
 import * as 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, REMOTE_SCHEME } from '../initializers/constants'
-import { signJsonLDObject } from './peertube-crypto'
+import { MActor, MVideoWithHost } from '../types/models'
 import { pageToStartAndCount } from './core-utils'
-import { URL } from 'url'
-import { MActor, MVideoAccountLight } from '../typings/models'
+import { signJsonLDObject } from './peertube-crypto'
 
-export type ContextType = 'All' | 'View' | 'Announce'
+function getContextData (type: ContextType) {
+  const context: any[] = [
+    'https://www.w3.org/ns/activitystreams',
+    'https://w3id.org/security/v1',
+    {
+      RsaSignature2017: 'https://w3id.org/security#RsaSignature2017'
+    }
+  ]
 
-function activityPubContextify <T> (data: T, type: ContextType = 'All') {
-  const base = {
-    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',
+        licence: 'sc:license',
+        subtitleLanguage: 'sc:subtitleLanguage',
+        sensitive: 'as:sensitive',
+        language: 'sc:inLanguage',
+
+        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',
+          '@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'
+        }
+      })
+    }
+
+    context.push(additional)
   }
 
-  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 {
+    '@context': context
   }
+}
 
-  return Object.assign({}, data, {
-    '@context': [
-      'https://www.w3.org/ns/activitystreams',
-      'https://w3id.org/security/v1',
-      base
-    ]
-  })
+function activityPubContextify <T> (data: T, type: ContextType = 'All') {
+  return Object.assign({}, data, getContextData(type))
 }
 
 type ActivityPubCollectionPaginationHandler = (start: number, count: number) => Bluebird<ResultList<any>> | Promise<ResultList<any>>
@@ -174,10 +201,12 @@ function checkUrlsSameHost (url1: string, url2: string) {
   return idHost && actorHost && idHost.toLowerCase() === actorHost.toLowerCase()
 }
 
-function buildRemoteVideoBaseUrl (video: MVideoAccountLight, path: string) {
-  const host = video.VideoChannel.Account.Actor.Server.host
+function buildRemoteVideoBaseUrl (video: MVideoWithHost, path: string, scheme?: string) {
+  if (!scheme) scheme = REMOTE_SCHEME.HTTP
+
+  const host = video.VideoChannel.Actor.Server.host
 
-  return REMOTE_SCHEME.HTTP + '://' + host + path
+  return scheme + '://' + host + path
 }
 
 // ---------------------------------------------------------------------------