import * as express from 'express'
-import { getFormattedObjects, getServerActor } from '../../helpers/utils'
+import { getServerActor } from '@server/models/application/application'
+import { buildNSFWFilter, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
+import { getFormattedObjects } from '../../helpers/utils'
+import { Hooks } from '../../lib/plugins/hooks'
+import { JobQueue } from '../../lib/job-queue'
import {
- authenticate,
asyncMiddleware,
+ authenticate,
commonVideosFiltersValidator,
- videoRatingValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ setDefaultVideosSort,
videoPlaylistsSortValidator,
- videoRatesSortValidator
+ videoRatesSortValidator,
+ videoRatingValidator
} from '../../middlewares'
import {
accountNameWithHostGetValidator,
accountsSortValidator,
- videosSortValidator,
- ensureAuthUserOwnsAccountValidator
+ ensureAuthUserOwnsAccountValidator,
+ videoChannelsSortValidator,
+ videoChannelStatsValidator,
+ videosSortValidator
} from '../../middlewares/validators'
+import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists'
import { AccountModel } from '../../models/account/account'
import { AccountVideoRateModel } from '../../models/account/account-video-rate'
import { VideoModel } from '../../models/video/video'
-import { buildNSFWFilter, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
import { VideoChannelModel } from '../../models/video/video-channel'
-import { JobQueue } from '../../lib/job-queue'
-import { logger } from '../../helpers/logger'
import { VideoPlaylistModel } from '../../models/video/video-playlist'
-import { commonVideoPlaylistFiltersValidator } from '../../middlewares/validators/videos/video-playlists'
const accountsRouter = express.Router()
asyncMiddleware(accountNameWithHostGetValidator),
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
commonVideosFiltersValidator,
accountsRouter.get('/:accountName/video-channels',
asyncMiddleware(accountNameWithHostGetValidator),
+ videoChannelStatsValidator,
+ paginationValidator,
+ videoChannelsSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
asyncMiddleware(listAccountChannels)
)
setDefaultSort,
setDefaultPagination,
commonVideoPlaylistFiltersValidator,
+ videoPlaylistsSearchValidator,
asyncMiddleware(listAccountPlaylists)
)
if (account.isOutdated()) {
JobQueue.Instance.createJob({ type: 'activitypub-refresher', payload: { type: 'actor', url: account.Actor.url } })
- .catch(err => logger.error('Cannot create AP refresher job for actor %s.', account.Actor.url, { err }))
}
return res.json(account.toFormattedJSON())
}
async function listAccountChannels (req: express.Request, res: express.Response) {
- const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
+ const options = {
+ accountId: res.locals.account.id,
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ withStats: req.query.withStats,
+ search: req.query.search
+ }
+
+ const resultList = await VideoChannelModel.listByAccount(options)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
const serverActor = await getServerActor()
// Allow users to see their private/unlisted video playlists
- let privateAndUnlisted = false
+ let listMyPlaylists = false
if (res.locals.oauth && res.locals.oauth.token.User.Account.id === res.locals.account.id) {
- privateAndUnlisted = true
+ listMyPlaylists = true
}
const resultList = await VideoPlaylistModel.listForApi({
+ search: req.query.search,
followerActorId: serverActor.id,
start: req.query.start,
count: req.query.count,
sort: req.query.sort,
accountId: res.locals.account.id,
- privateAndUnlisted,
+ listMyPlaylists,
type: req.query.playlistType
})
async function listAccountVideos (req: express.Request, res: express.Response) {
const account = res.locals.account
const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
+ const countVideos = getCountVideos(req)
- const resultList = await VideoModel.listForApi({
+ const apiOptions = await Hooks.wrapObject({
followerActorId,
start: req.query.start,
count: req.query.count,
nsfw: buildNSFWFilter(res, req.query.nsfw),
withFiles: false,
accountId: account.id,
- user: res.locals.oauth ? res.locals.oauth.token.User : undefined
- })
+ user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
+ countVideos,
+ search: req.query.search
+ }, 'filter:api.accounts.videos.list.params')
+
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoModel.listForApi,
+ apiOptions,
+ 'filter:api.accounts.videos.list.result'
+ )
return res.json(getFormattedObjects(resultList.data, resultList.total))
}