X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Faccounts.ts;h=8d9f92d933f930f10e52f51b5abac206c5f09369;hb=d0800f7661f13fabe7bb6f4aa0ea50764f106405;hp=03c83109233383af1f5c3d2f6835184e4dd7fac8;hpb=418d092afa81e2c8fe8ac6838fc4b5eb0af6a782;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index 03c831092..8d9f92d93 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts @@ -1,23 +1,40 @@ -import * as express from 'express' -import { getFormattedObjects, getServerActor } from '../../helpers/utils' +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, optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort, - videoPlaylistsSortValidator + setDefaultVideosSort, + videoPlaylistsSortValidator, + videoRatesSortValidator, + videoRatingValidator } from '../../middlewares' -import { accountNameWithHostGetValidator, 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' -import { UserModel } from '../../models/account/user' const accountsRouter = express.Router() @@ -38,7 +55,7 @@ accountsRouter.get('/:accountName/videos', asyncMiddleware(accountNameWithHostGetValidator), paginationValidator, videosSortValidator, - setDefaultSort, + setDefaultVideosSort, setDefaultPagination, optionalAuthenticate, commonVideosFiltersValidator, @@ -47,6 +64,11 @@ accountsRouter.get('/:accountName/videos', accountsRouter.get('/:accountName/video-channels', asyncMiddleware(accountNameWithHostGetValidator), + videoChannelStatsValidator, + paginationValidator, + videoChannelsSortValidator, + setDefaultSort, + setDefaultPagination, asyncMiddleware(listAccountChannels) ) @@ -57,9 +79,34 @@ accountsRouter.get('/:accountName/video-playlists', 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) +) + // --------------------------------------------------------------------------- export { @@ -69,11 +116,10 @@ export { // --------------------------------------------------------------------------- function getAccount (req: express.Request, res: express.Response) { - const account: AccountModel = res.locals.account + 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 })) } return res.json(account.toFormattedJSON()) @@ -86,7 +132,16 @@ async function listAccounts (req: express.Request, res: express.Response) { } 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.listByAccountForAPI(options) return res.json(getFormattedObjects(resultList.data, resultList.total)) } @@ -95,43 +150,85 @@ async function listAccountPlaylists (req: express.Request, res: express.Response const serverActor = await getServerActor() // Allow users to see their private/unlisted video playlists - let privateAndUnlisted = false - if (res.locals.oauth && (res.locals.oauth.token.User as UserModel).Account.id === res.locals.account.id) { - privateAndUnlisted = true + 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, accountId: res.locals.account.id, - privateAndUnlisted + listMyPlaylists, + type: req.query.playlistType }) return res.json(getFormattedObjects(resultList.data, resultList.total)) } async function listAccountVideos (req: express.Request, res: express.Response) { - const account: AccountModel = res.locals.account - const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined + 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))) +} - const resultList = await VideoModel.listForApi({ - followerActorId, +async function listAccountRatings (req: express.Request, res: express.Response) { + const account = res.locals.account + + const resultList = await AccountVideoRateModel.listByAccountForApi({ + accountId: account.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: account.id, - user: res.locals.oauth ? res.locals.oauth.token.User : undefined + 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))