Add version to generate types packages

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

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index 08aef29083dbb14a3753cf121b41f6d1c4dae275..fe721cbac1f01e351d157dd8a7d965c45ffd8c1d 100644 (file)
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -1,9 +1,8 @@
-import * as Bluebird from 'bluebird'
+import 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 { MActor, MVideoWithHost } from '../types/models'
 import { pageToStartAndCount } from './core-utils'
@@ -182,16 +181,16 @@ async function activityPubCollectionPagination (
 
 }
 
-function buildSignedActivity (byActor: MActor, data: Object, contextType?: ContextType) {
+function buildSignedActivity <T> (byActor: MActor, data: T, contextType?: ContextType) {
   const activity = activityPubContextify(data, contextType)
 
-  return signJsonLDObject(byActor, activity) as Promise<Activity>
+  return signJsonLDObject(byActor, activity)
 }
 
-function getAPId (activity: string | { id: string }) {
-  if (typeof activity === 'string') return activity
+function getAPId (object: string | { id: string }) {
+  if (typeof object === 'string') return object
 
-  return activity.id
+  return object.id
 }
 
 function checkUrlsSameHost (url1: string, url2: string) {