From f0a47bc92aa20b91b46197a4d3fc430aea962848 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 29 Aug 2019 14:31:04 +0200 Subject: Hide video abuses from muted accounts --- server/controllers/api/videos/abuse.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 39c841ffe..4ae899b7e 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -1,7 +1,7 @@ import * as express from 'express' import { UserRight, VideoAbuseCreate, VideoAbuseState } from '../../../../shared' import { logger } from '../../../helpers/logger' -import { getFormattedObjects } from '../../../helpers/utils' +import { getFormattedObjects, getServerActor } from '../../../helpers/utils' import { sequelizeTypescript } from '../../../initializers' import { asyncMiddleware, @@ -62,7 +62,16 @@ export { // --------------------------------------------------------------------------- async function listVideoAbuses (req: express.Request, res: express.Response) { - const resultList = await VideoAbuseModel.listForApi(req.query.start, req.query.count, req.query.sort) + const user = res.locals.oauth.token.user + const serverActor = await getServerActor() + + const resultList = await VideoAbuseModel.listForApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + serverAccountId: serverActor.Account.id, + user + }) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -- cgit v1.2.3