Optimize context for CacheFile

server/controllers/activitypub/client.ts

@@ -335,10 +335,10 @@ async function videoRedundancyController (req: express.Request, res: express.Res
 
   if (req.path.endsWith('/activity')) {
     const data = buildCreateActivity(videoRedundancy.url, serverActor, object, audience)
-    return activityPubResponse(activityPubContextify(data), res)
+    return activityPubResponse(activityPubContextify(data, 'CacheFile'), res)
   }
 
-  return activityPubResponse(activityPubContextify(object), res)
+  return activityPubResponse(activityPubContextify(object, 'CacheFile'), res)
 }
 
 async function videoPlaylistController (req: express.Request, res: express.Response) {

server/helpers/activitypub.ts

@@ -8,17 +8,30 @@ import { pageToStartAndCount } from './core-utils'
 import { URL } from 'url'
 import { MActor, MVideoAccountLight } from '../typings/models'
 
-export type ContextType = 'All' | 'View' | 'Announce'
+export type ContextType = 'All' | 'View' | 'Announce' | 'CacheFile'
 
-function activityPubContextify <T> (data: T, type: ContextType = 'All') {
+function getContextData (type: ContextType) {
-  const base = {
+  const context: any[] = [
+    'https://www.w3.org/ns/activitystreams',
+    'https://w3id.org/security/v1',
+    {
       RsaSignature2017: 'https://w3id.org/security#RsaSignature2017'
     }
+  ]
 
-  if (type === 'All') {
+  if (type !== 'View' && type !== 'Announce') {
-    Object.assign(base, {
+    const additional = {
       pt: 'https://joinpeertube.org/ns#',
-      sc: 'http://schema.org#',
+      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',
@@ -26,8 +39,7 @@ function activityPubContextify <T> (data: T, type: ContextType = 'All') {
         subtitleLanguage: 'sc:subtitleLanguage',
         sensitive: 'as:sensitive',
         language: 'sc:inLanguage',
-      expires: 'sc:expires',
+
-      CacheFile: 'pt:CacheFile',
         Infohash: 'pt:Infohash',
         originallyPublishedAt: 'sc:datePublished',
         views: {
@@ -97,13 +109,16 @@ function activityPubContextify <T> (data: T, type: ContextType = 'All') {
       })
     }
 
-  return Object.assign({}, data, {
+    context.push(additional)
-    '@context': [
+  }
-      'https://www.w3.org/ns/activitystreams',
+
-      'https://w3id.org/security/v1',
+  return {
-      base
+    '@context': context
-    ]
+  }
-  })
+}
+
+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>>

server/lib/activitypub/send/send-create.ts

@@ -16,6 +16,7 @@ import {
   MVideoRedundancyFileVideo,
   MVideoRedundancyStreamingPlaylistVideo
 } from '../../../typings/models'
+import { ContextType } from '@server/helpers/activitypub'
 
 async function sendCreateVideo (video: MVideoAP, t: Transaction) {
   if (!video.hasPrivacyForFederation()) return undefined
@@ -42,7 +43,8 @@ async function sendCreateCacheFile (
     byActor,
     video,
     url: fileRedundancy.url,
-    object: fileRedundancy.toActivityPubObject()
+    object: fileRedundancy.toActivityPubObject(),
+    contextType: 'CacheFile'
   })
 }
 
@@ -135,6 +137,7 @@ async function sendVideoRelatedCreateActivity (options: {
   url: string
   object: any
   transaction?: Transaction
+  contextType?: ContextType
 }) {
   const activityBuilder = (audience: ActivityAudience) => {
     return buildCreateActivity(options.url, options.byActor, options.object, audience)

server/lib/activitypub/send/send-update.ts

@@ -84,7 +84,7 @@ async function sendUpdateCacheFile (byActor: MActorLight, redundancyModel: MVide
     return buildUpdateActivity(url, byActor, redundancyObject, audience)
   }
 
-  return sendVideoRelatedActivity(activityBuilder, { byActor, video })
+  return sendVideoRelatedActivity(activityBuilder, { byActor, video, contextType: 'CacheFile' })
 }
 
 async function sendUpdateVideoPlaylist (videoPlaylist: MVideoPlaylistFull, t: Transaction) {