diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-05 11:15:06 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-05 11:22:38 +0200 |
| commit | 6e46de095d7169355dd83030f6ce4a582304153a (patch) | |
| tree | dfa78e2008d3d135a00b798b05350b4975145acc /server/controllers/api/search.ts | |
| parent | a585824160d016db7c9bff0e1cb1ffa3aaf73d74 (diff) | |
| download | PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.tar.gz PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.tar.zst PeerTube-6e46de095d7169355dd83030f6ce4a582304153a.zip | |
Add user history and resume videos
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 fd4db7a54..4be2b5ef7 100644 --- a/server/controllers/api/search.ts +++ b/server/controllers/api/search.ts | |||
| @@ -117,7 +117,8 @@ function searchVideos (req: express.Request, res: express.Response) { | |||
| 117 | async function searchVideosDB (query: VideosSearchQuery, res: express.Response) { | 117 | 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 | }) | 122 | }) |
| 122 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) | 123 | const resultList = await VideoModel.searchAndPopulateAccountAndServer(options) |
| 123 | 124 | ||