yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Add ability for users to block an account/instance on server side

Browse source
This commit is contained in:
Chocobozzz 2018-10-12 15:26:04 +02:00
parent dffd5d127f
commit 7ad9b9846c
33 changed files with 1344 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/controllers/api/accounts.ts
View file

@ -1,7 +1,8 @@
import * as express from 'express'
import { getFormattedObjects } from '../../helpers/utils'
import {
asyncMiddleware, commonVideosFiltersValidator,
asyncMiddleware,
commonVideosFiltersValidator,
listVideoAccountChannelsValidator,
optionalAuthenticate,
paginationValidator,
@ -90,7 +91,7 @@ async function listAccountVideos (req: express.Request, res: express.Response, n
nsfw: buildNSFWFilter(res, req.query.nsfw),
withFiles: false,
accountId: account.id,
userId: res.locals.oauth ? res.locals.oauth.token.User.id : undefined
user: res.locals.oauth ? res.locals.oauth.token.User : undefined
})
return res.json(getFormattedObjects(resultList.data, resultList.total))