diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-12 15:26:04 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-16 16:41:36 +0200 |
| commit | 7ad9b9846c44d198a736183fb186c2039f5236b5 (patch) | |
| tree | 9c8456882a261c0522efb507f20e323c2741a0f8 /server/controllers/api/search.ts | |
| parent | dffd5d127f49eb63d2b2b3133aec75ec1d7e4dcb (diff) | |
| download | PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.gz PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.zst PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.zip | |
Add ability for users to block an account/instance on server side
Diffstat (limited to 'server/controllers/api/search.ts')
| -rw-r--r-- | server/controllers/api/search.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/api/search.ts b/server/controllers/api/search.ts index a8a6cfb08..534305ba6 100644 --- a/server/controllers/api/search.ts +++ b/server/controllers/api/search.ts | |||
| @@ -119,7 +119,7 @@ async function searchVideosDB (query: VideosSearchQuery, res: express.Response) | |||
| 119 | includeLocalVideos: true, | 119 | includeLocalVideos: true, |
| 120 | nsfw: buildNSFWFilter(res, query.nsfw), | 120 | nsfw: buildNSFWFilter(res, query.nsfw), |
| 121 | filter: query.filter, | 121 | filter: query.filter, |
| 122 | userId: res.locals.oauth ? res.locals.oauth.token.User.id : undefined | 122 | user: res.locals.oauth ? res.locals.oauth.token.User : undefined |
| 123 | }) | 123 | }) |
| 124 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) | 124 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) |
| 125 | 125 | ||