import * as express from 'express'
-import { Activity, ActivityAdd } from '../../../shared/models/activitypub/activity'
-import { activityPubCollectionPagination, activityPubContextify } from '../../helpers/activitypub'
-import { database as db } from '../../initializers'
-import { addActivityData } from '../../lib/activitypub/send/send-add'
-import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
-import { announceActivityData } from '../../lib/index'
-import { asyncMiddleware, localAccountValidator } from '../../middlewares'
-import { AccountInstance } from '../../models/account/account-interface'
+import { Activity } from '../../../shared/models/activitypub/activity'
+import { activityPubCollectionPagination } from '../../helpers/activitypub'
import { pageToStartAndCount } from '../../helpers/core-utils'
import { ACTIVITY_PUB } from '../../initializers/constants'
+import { announceActivityData, createActivityData } from '../../lib/activitypub/send'
+import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url'
+import { asyncMiddleware, localAccountValidator } from '../../middlewares'
+import { AccountModel } from '../../models/account/account'
+import { VideoModel } from '../../models/video/video'
const outboxRouter = express.Router()
-outboxRouter.get('/account/:name/outbox',
+outboxRouter.get('/accounts/:name/outbox',
localAccountValidator,
asyncMiddleware(outboxController)
)
// ---------------------------------------------------------------------------
async function outboxController (req: express.Request, res: express.Response, next: express.NextFunction) {
- const account: AccountInstance = res.locals.account
+ const account: AccountModel = res.locals.account
+ const actor = account.Actor
- const page = req.params.page || 1
+ const page = req.query.page || 1
const { start, count } = pageToStartAndCount(page, ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE)
- const data = await db.Video.listAllAndSharedByAccountForOutbox(account.id, start, count)
+ const data = await VideoModel.listAllAndSharedByActorForOutbox(actor.id, start, count)
const activities: Activity[] = []
- console.log(account.url)
-
for (const video of data.data) {
const videoObject = video.toActivityPubObject()
- let addActivity: ActivityAdd = await addActivityData(video.url, account, video, video.VideoChannel.url, videoObject)
+ const videoChannel = video.VideoChannel
// This is a shared video
- if (video.VideoShare !== undefined) {
- const url = getAnnounceActivityPubUrl(video.url, account)
- const announceActivity = await announceActivityData(url, account, addActivity)
+ if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
+ const createActivity = await createActivityData(video.url, videoChannel.Account.Actor, videoObject, undefined)
+
+ const url = getAnnounceActivityPubUrl(video.url, actor)
+ const announceActivity = await announceActivityData(url, actor, createActivity, undefined)
+
activities.push(announceActivity)
} else {
- activities.push(addActivity)
+ const createActivity = await createActivityData(video.url, videoChannel.Account.Actor, videoObject, undefined)
+
+ activities.push(createActivity)
}
}
data: activities,
total: data.total
}
- const json = activityPubCollectionPagination(account.url + '/outbox', page, newResult)
+ const json = activityPubCollectionPagination(account.Actor.url + '/outbox', page, newResult)
return res.json(json).end()
}