X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Foverviews.ts;h=5b16232e2a0399c35545c3a47f029dc5b300158b;hb=d1bfbdeb203b0e4f37e9468861c690171156ee29;hp=aaa341d54afc30b00a74ff5bef049e6c1bb27d76;hpb=a24bd1ed41b43790bab6ba789580bb4e85f07d85;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/overviews.ts b/server/controllers/api/overviews.ts index aaa341d54..5b16232e2 100644 --- a/server/controllers/api/overviews.ts +++ b/server/controllers/api/overviews.ts @@ -1,12 +1,13 @@ -import * as express from 'express' -import * as memoizee from 'memoizee' +import express from 'express' +import memoizee from 'memoizee' import { logger } from '@server/helpers/logger' +import { Hooks } from '@server/lib/plugins/hooks' +import { VideoModel } from '@server/models/video/video' import { CategoryOverview, ChannelOverview, TagOverview, VideosOverview } from '../../../shared/models/overviews' import { buildNSFWFilter } from '../../helpers/express-utils' import { MEMOIZE_TTL, OVERVIEWS } from '../../initializers/constants' import { asyncMiddleware, optionalAuthenticate, videosOverviewValidator } from '../../middlewares' import { TagModel } from '../../models/video/tag' -import { VideoModel } from '../../models/video/video' const overviewsRouter = express.Router() @@ -108,7 +109,7 @@ async function getVideos ( res: express.Response, where: { videoChannelId?: number, tagsOneOf?: string[], categoryOneOf?: number[] } ) { - const query = Object.assign({ + const query = await Hooks.wrapObject({ start: 0, count: 12, sort: '-createdAt', @@ -116,10 +117,16 @@ async function getVideos ( nsfw: buildNSFWFilter(res), user: res.locals.oauth ? res.locals.oauth.token.User : undefined, withFiles: false, - countVideos: false - }, where) + countVideos: false, - const { data } = await VideoModel.listForApi(query) + ...where + }, 'filter:api.overviews.videos.list.params') + + const { data } = await Hooks.wrapPromiseFun( + VideoModel.listForApi, + query, + 'filter:api.overviews.videos.list.result' + ) return data.map(d => d.toFormattedJSON()) }