Add plugin hook on registration

[github/Chocobozzz/PeerTube.git] / server / helpers / activitypub.ts

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index dc42068d854b91ac69947b342d6a18af1ed59259..97c809a0c51fae1eaf6e2d5b0f70617f282c448e 100644 (file)
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -2,11 +2,12 @@ import * as Bluebird from 'bluebird'
 import * as validator from 'validator'
 import { ResultList } from '../../shared/models'
 import { Activity } from '../../shared/models/activitypub'
-import { ACTIVITY_PUB } from '../initializers'
+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, {
@@ -29,47 +30,47 @@ function activityPubContextify <T> (data: T) {
         Infohash: 'pt:Infohash',
         originallyPublishedAt: 'sc:datePublished',
         views: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:views'
         },
         state: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:state'
         },
         size: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:size'
         },
         fps: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:fps'
         },
         startTimestamp: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:startTimestamp'
         },
         stopTimestamp: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:stopTimestamp'
         },
         position: {
-          type: 'sc:Number',
+          '@type': 'sc:Number',
           '@id': 'pt:position'
         },
         commentsEnabled: {
-          type: 'sc:Boolean',
+          '@type': 'sc:Boolean',
           '@id': 'pt:commentsEnabled'
         },
         downloadEnabled: {
-          type: 'sc:Boolean',
+          '@type': 'sc:Boolean',
           '@id': 'pt:downloadEnabled'
         },
         waitTranscoding: {
-          type: 'sc:Boolean',
+          '@type': 'sc:Boolean',
           '@id': 'pt:waitTranscoding'
         },
         support: {
-          type: 'sc:Text',
+          '@type': 'sc:Text',
           '@id': 'pt:support'
         }
       },
@@ -143,7 +144,7 @@ async function activityPubCollectionPagination (baseUrl: string, handler: Activi
 
 }
 
-function buildSignedActivity (byActor: ActorModel, data: Object) {
+function buildSignedActivity (byActor: MActor, data: Object) {
   const activity = activityPubContextify(data)
 
   return signJsonLDObject(byActor, activity) as Promise<Activity>