diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/controllers/api/search.ts | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/controllers/api/search.ts')
| -rw-r--r-- | server/controllers/api/search.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/controllers/api/search.ts b/server/controllers/api/search.ts index 4be2b5ef7..534305ba6 100644 --- a/server/controllers/api/search.ts +++ b/server/controllers/api/search.ts | |||
| @@ -118,7 +118,8 @@ async function searchVideosDB (query: VideosSearchQuery, res: express.Response) | |||
| 118 | const options = Object.assign(query, { | 118 | const options = Object.assign(query, { |
| 119 | includeLocalVideos: true, | 119 | includeLocalVideos: true, |
| 120 | nsfw: buildNSFWFilter(res, query.nsfw), | 120 | nsfw: buildNSFWFilter(res, query.nsfw), |
| 121 | userId: res.locals.oauth ? res.locals.oauth.token.User.id : undefined | 121 | filter: query.filter, |
| 122 | user: res.locals.oauth ? res.locals.oauth.token.User : undefined | ||
| 122 | }) | 123 | }) |
| 123 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) | 124 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) |
| 124 | 125 | ||