X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Faccounts.ts;h=2d86d393ceae5067a298e0b20ca61da76993f28b;hb=09f3d81e0c8edebbe8f5698811ecfb165f942378;hp=aa01ea1ebb0b966bd4b45bd210843928eca1bbe6;hpb=c100a6142e6571312db9f6407698a21a08b593fb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index aa01ea1eb..2d86d393c 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts @@ -1,32 +1,43 @@ -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 { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' +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 { - authenticate, asyncMiddleware, + authenticate, commonVideosFiltersValidator, - videoRatingValidator, optionalAuthenticate, paginationValidator, setDefaultPagination, setDefaultSort, + setDefaultVideosSort, videoPlaylistsSortValidator, - videoRatesSortValidator + videoRatesSortValidator, + videoRatingValidator } from '../../middlewares' import { accountNameWithHostGetValidator, + accountsFollowersSortValidator, accountsSortValidator, - videosSortValidator, - ensureAuthUserOwnsAccountValidator + ensureAuthUserOwnsAccountValidator, + ensureCanManageChannelOrAccount, + videoChannelsSortValidator, + videoChannelStatsValidator, + videoChannelSyncsSortValidator, + 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() @@ -47,7 +58,7 @@ accountsRouter.get('/:accountName/videos', asyncMiddleware(accountNameWithHostGetValidator), paginationValidator, videosSortValidator, - setDefaultSort, + setDefaultVideosSort, setDefaultPagination, optionalAuthenticate, commonVideosFiltersValidator, @@ -56,9 +67,25 @@ accountsRouter.get('/:accountName/videos', accountsRouter.get('/:accountName/video-channels', asyncMiddleware(accountNameWithHostGetValidator), + videoChannelStatsValidator, + paginationValidator, + videoChannelsSortValidator, + setDefaultSort, + setDefaultPagination, asyncMiddleware(listAccountChannels) ) +accountsRouter.get('/:accountName/video-channel-syncs', + authenticate, + asyncMiddleware(accountNameWithHostGetValidator), + ensureCanManageChannelOrAccount, + paginationValidator, + videoChannelSyncsSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(listAccountChannelsSync) +) + accountsRouter.get('/:accountName/video-playlists', optionalAuthenticate, asyncMiddleware(accountNameWithHostGetValidator), @@ -67,6 +94,7 @@ accountsRouter.get('/:accountName/video-playlists', setDefaultSort, setDefaultPagination, commonVideoPlaylistFiltersValidator, + videoPlaylistsSearchValidator, asyncMiddleware(listAccountPlaylists) ) @@ -82,6 +110,17 @@ accountsRouter.get('/:accountName/ratings', asyncMiddleware(listAccountRatings) ) +accountsRouter.get('/:accountName/followers', + authenticate, + asyncMiddleware(accountNameWithHostGetValidator), + ensureAuthUserOwnsAccountValidator, + paginationValidator, + accountsFollowersSortValidator, + setDefaultSort, + setDefaultPagination, + asyncMiddleware(listAccountFollowers) +) + // --------------------------------------------------------------------------- export { @@ -94,8 +133,7 @@ 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()) @@ -108,7 +146,30 @@ 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)) +} + +async function listAccountChannelsSync (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, + search: req.query.search + } + + const resultList = await VideoChannelSyncModel.listByAccountForAPI(options) return res.json(getFormattedObjects(resultList.data, resultList.total)) } @@ -117,18 +178,19 @@ 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 + 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 }) @@ -136,28 +198,37 @@ async function listAccountPlaylists (req: express.Request, res: express.Response } async function listAccountVideos (req: express.Request, res: express.Response) { + const serverActor = await getServerActor() + const account = res.locals.account - const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined - const resultList = await VideoModel.listForApi({ - followerActorId, - 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, + 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 - }) + user: res.locals.oauth ? res.locals.oauth.token.User : undefined, + countVideos + }, 'filter:api.accounts.videos.list.params') - return res.json(getFormattedObjects(resultList.data, resultList.total)) + 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) { @@ -170,5 +241,23 @@ async function listAccountRatings (req: express.Request, res: express.Response) sort: req.query.sort, type: req.query.rating }) - return res.json(getFormattedObjects(resultList.rows, resultList.count)) + 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)) }