diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-08-22 10:43:11 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-08-22 10:43:11 +0200 |
| commit | 5c5e587307a27e173333789b5b5167d35f468b01 (patch) | |
| tree | 94e3721caf2e11d38fd5f4112c0fc98da89ac535 /server/controllers/services.ts | |
| parent | 1b42d73f44811eec1b7ddd72dd0d640a57c3376c (diff) | |
| parent | b5fecbf44192144d1ca27c23a0b53922de288c10 (diff) | |
| download | PeerTube-5c5e587307a27e173333789b5b5167d35f468b01.tar.gz PeerTube-5c5e587307a27e173333789b5b5167d35f468b01.tar.zst PeerTube-5c5e587307a27e173333789b5b5167d35f468b01.zip | |
Merge branch 'feature/strong-model-types' into develop
Diffstat (limited to 'server/controllers/services.ts')
| -rw-r--r-- | server/controllers/services.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/services.ts b/server/controllers/services.ts index c1c53c3fc..ec057235f 100644 --- a/server/controllers/services.ts +++ b/server/controllers/services.ts | |||
| @@ -23,7 +23,7 @@ export { | |||
| 23 | // --------------------------------------------------------------------------- | 23 | // --------------------------------------------------------------------------- |
| 24 | 24 | ||
| 25 | function generateOEmbed (req: express.Request, res: express.Response) { | 25 | function generateOEmbed (req: express.Request, res: express.Response) { |
| 26 | const video = res.locals.video | 26 | const video = res.locals.videoAll |
| 27 | const webserverUrl = WEBSERVER.URL | 27 | const webserverUrl = WEBSERVER.URL |
| 28 | const maxHeight = parseInt(req.query.maxheight, 10) | 28 | const maxHeight = parseInt(req.query.maxheight, 10) |
| 29 | const maxWidth = parseInt(req.query.maxwidth, 10) | 29 | const maxWidth = parseInt(req.query.maxwidth, 10) |