-import * as express from 'express'
+import express from 'express'
+import { pickCommonVideoQuery } from '@server/helpers/query'
+import { ActorFollowModel } from '@server/models/actor/actor-follow'
+import { getServerActor } from '@server/models/application/application'
+import { guessAdditionalAttributesFromQuery } from '@server/models/video/formatter/video-format-utils'
+import { buildNSFWFilter, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils'
import { getFormattedObjects } from '../../helpers/utils'
+import { JobQueue } from '../../lib/job-queue'
+import { Hooks } from '../../lib/plugins/hooks'
import {
asyncMiddleware,
+ authenticate,
commonVideosFiltersValidator,
- listVideoAccountChannelsValidator,
optionalAuthenticate,
paginationValidator,
setDefaultPagination,
- setDefaultSort
+ setDefaultSort,
+ setDefaultVideosSort,
+ videoPlaylistsSortValidator,
+ videoRatesSortValidator,
+ videoRatingValidator
} from '../../middlewares'
-import { accountsNameWithHostGetValidator, accountsSortValidator, videosSortValidator } from '../../middlewares/validators'
+import {
+ accountNameWithHostGetValidator,
+ accountsFollowersSortValidator,
+ accountsSortValidator,
+ 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'
const accountsRouter = express.Router()
)
accountsRouter.get('/:accountName',
- asyncMiddleware(accountsNameWithHostGetValidator),
+ asyncMiddleware(accountNameWithHostGetValidator),
getAccount
)
accountsRouter.get('/:accountName/videos',
- asyncMiddleware(accountsNameWithHostGetValidator),
+ asyncMiddleware(accountNameWithHostGetValidator),
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
optionalAuthenticate,
commonVideosFiltersValidator,
)
accountsRouter.get('/:accountName/video-channels',
- asyncMiddleware(listVideoAccountChannelsValidator),
- asyncMiddleware(listVideoAccountChannels)
+ asyncMiddleware(accountNameWithHostGetValidator),
+ videoChannelStatsValidator,
+ paginationValidator,
+ videoChannelsSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ asyncMiddleware(listAccountChannels)
+)
+
+accountsRouter.get('/:accountName/video-playlists',
+ optionalAuthenticate,
+ asyncMiddleware(accountNameWithHostGetValidator),
+ paginationValidator,
+ videoPlaylistsSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ commonVideoPlaylistFiltersValidator,
+ videoPlaylistsSearchValidator,
+ asyncMiddleware(listAccountPlaylists)
+)
+
+accountsRouter.get('/:accountName/ratings',
+ authenticate,
+ asyncMiddleware(accountNameWithHostGetValidator),
+ ensureAuthUserOwnsAccountValidator,
+ paginationValidator,
+ videoRatesSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ videoRatingValidator,
+ asyncMiddleware(listAccountRatings)
+)
+
+accountsRouter.get('/:accountName/followers',
+ authenticate,
+ asyncMiddleware(accountNameWithHostGetValidator),
+ ensureAuthUserOwnsAccountValidator,
+ paginationValidator,
+ accountsFollowersSortValidator,
+ setDefaultSort,
+ setDefaultPagination,
+ asyncMiddleware(listAccountFollowers)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function getAccount (req: express.Request, res: express.Response, next: express.NextFunction) {
- const account: AccountModel = res.locals.account
+function getAccount (req: express.Request, res: express.Response) {
+ const account = res.locals.account
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 }))
+ JobQueue.Instance.createJobAsync({ type: 'activitypub-refresher', payload: { type: 'actor', url: account.Actor.url } })
}
return res.json(account.toFormattedJSON())
}
-async function listAccounts (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function listAccounts (req: express.Request, res: express.Response) {
const resultList = await AccountModel.listForApi(req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-async function listVideoAccountChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await VideoChannelModel.listByAccount(res.locals.account.id)
+async function listAccountChannels (req: express.Request, res: express.Response) {
+ 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.listByAccountForAPI(options)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
- const account: AccountModel = res.locals.account
- const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined
+async function listAccountPlaylists (req: express.Request, res: express.Response) {
+ const serverActor = await getServerActor()
- const resultList = await VideoModel.listForApi({
- followerActorId,
+ // Allow users to see their private/unlisted video playlists
+ let listMyPlaylists = false
+ if (res.locals.oauth && res.locals.oauth.token.User.Account.id === res.locals.account.id) {
+ 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,
- includeLocalVideos: true,
- categoryOneOf: req.query.categoryOneOf,
- licenceOneOf: req.query.licenceOneOf,
- languageOneOf: req.query.languageOneOf,
- tagsOneOf: req.query.tagsOneOf,
- tagsAllOf: req.query.tagsAllOf,
- filter: req.query.filter,
- nsfw: buildNSFWFilter(res, req.query.nsfw),
- withFiles: false,
+ accountId: res.locals.account.id,
+ listMyPlaylists,
+ type: req.query.playlistType
+ })
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function listAccountVideos (req: express.Request, res: express.Response) {
+ const serverActor = await getServerActor()
+
+ const account = res.locals.account
+
+ const displayOnlyForFollower = isUserAbleToSearchRemoteURI(res)
+ ? null
+ : {
+ actorId: serverActor.id,
+ orLocalVideos: true
+ }
+
+ const countVideos = getCountVideos(req)
+ const query = pickCommonVideoQuery(req.query)
+
+ const apiOptions = await Hooks.wrapObject({
+ ...query,
+
+ displayOnlyForFollower,
+ nsfw: buildNSFWFilter(res, query.nsfw),
+ accountId: account.id,
+ user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
+ countVideos
+ }, '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, guessAdditionalAttributesFromQuery(query)))
+}
+
+async function listAccountRatings (req: express.Request, res: express.Response) {
+ const account = res.locals.account
+
+ const resultList = await AccountVideoRateModel.listByAccountForApi({
accountId: account.id,
- user: res.locals.oauth ? res.locals.oauth.token.User : undefined
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ type: req.query.rating
+ })
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function listAccountFollowers (req: express.Request, res: express.Response) {
+ const account = res.locals.account
+
+ const channels = await VideoChannelModel.listAllByAccount(account.id)
+ const actorIds = [ account.actorId ].concat(channels.map(c => c.actorId))
+
+ const resultList = await ActorFollowModel.listFollowersForApi({
+ actorIds,
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search,
+ state: 'accepted'
})
return res.json(getFormattedObjects(resultList.data, resultList.total))
projects / github / Chocobozzz / PeerTube.git / blobdiff