-import { Activity } from '../../shared/models/activitypub/activity'
-import { ResultList } from '../../shared/models/result-list.model'
-import { AccountInstance } from '../models/account/account-interface'
+import { ResultList } from '../../shared/models'
+import { Activity } from '../../shared/models/activitypub'
+import { ACTIVITY_PUB } from '../initializers'
+import { ActorModel } from '../models/activitypub/actor'
import { signObject } from './peertube-crypto'
-import { ACTIVITY_PUB } from '../initializers/constants'
function activityPubContextify <T> (data: T) {
return Object.assign(data,{
'https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1',
{
+ 'RsaSignature2017': 'https://w3id.org/security#RsaSignature2017',
'Hashtag': 'as:Hashtag',
'uuid': 'http://schema.org/identifier',
'category': 'http://schema.org/category',
'nsfw': 'as:sensitive',
'language': 'http://schema.org/inLanguage',
'views': 'http://schema.org/Number',
- 'size': 'http://schema.org/Number',
- 'VideoChannel': 'https://peertu.be/ns/VideoChannel'
+ 'size': 'http://schema.org/Number'
}
]
})
}
-function activityPubCollectionPagination (url: string, page: number, result: ResultList<any>) {
+function activityPubCollection (results: any[]) {
+ return {
+ type: 'OrderedCollection',
+ totalItems: results.length,
+ orderedItems: results
+ }
+}
+
+function activityPubCollectionPagination (url: string, page: any, result: ResultList<any>) {
let next: string
let prev: string
+ // Assert page is a number
+ page = parseInt(page, 10)
+
// There are more results
- if (result.total > ((page + 1) * ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)) {
+ if (result.total > page * ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE) {
next = url + '?page=' + (page + 1)
}
totalItems: result.total,
first: orderedCollectionPagination
})
+ } else {
+ orderedCollectionPagination['totalItems'] = result.total
}
return orderedCollectionPagination
}
-function buildSignedActivity (byAccount: AccountInstance, data: Object) {
+function buildSignedActivity (byActor: ActorModel, data: Object) {
const activity = activityPubContextify(data)
- return signObject(byAccount, activity) as Promise<Activity>
+ return signObject(byActor, activity) as Promise<Activity>
}
// ---------------------------------------------------------------------------
export {
activityPubContextify,
activityPubCollectionPagination,
+ activityPubCollection,
buildSignedActivity
}