X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fservices.ts;h=c1c53c3fc80466a72aad65ed53493e586d688a8c;hb=18a6f04c071f7a0735eb39b8c67fd51a082d1a31;hp=c272edccd5196256d93089544d7388e2f11cfd90;hpb=e8cb44090e654fda339506dccfcec7fea8722723;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index c272edccd..c1c53c3fc 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,8 +1,7 @@
import * as express from 'express'
-import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
+import { EMBED_SIZE, PREVIEWS_SIZE, WEBSERVER } from '../initializers/constants'
import { asyncMiddleware, oembedValidator } from '../middlewares'
-import { accountsNameWithHostGetValidator } from '../middlewares/validators'
-import { VideoModel } from '../models/video/video'
+import { accountNameWithHostGetValidator } from '../middlewares/validators'
const servicesRouter = express.Router()
@@ -10,8 +9,8 @@ servicesRouter.use('/oembed',
asyncMiddleware(oembedValidator),
generateOEmbed
)
-servicesRouter.use('/redirect/accounts/:nameWithHost',
- asyncMiddleware(accountsNameWithHostGetValidator),
+servicesRouter.use('/redirect/accounts/:accountName',
+ asyncMiddleware(accountNameWithHostGetValidator),
redirectToAccountUrl
)
@@ -23,14 +22,14 @@ export {
// ---------------------------------------------------------------------------
-function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
- const video = res.locals.video as VideoModel
- const webserverUrl = CONFIG.WEBSERVER.URL
+function generateOEmbed (req: express.Request, res: express.Response) {
+ const video = res.locals.video
+ const webserverUrl = WEBSERVER.URL
const maxHeight = parseInt(req.query.maxheight, 10)
const maxWidth = parseInt(req.query.maxwidth, 10)
- const embedUrl = webserverUrl + video.getEmbedPath()
- let thumbnailUrl = webserverUrl + video.getPreviewPath()
+ const embedUrl = webserverUrl + video.getEmbedStaticPath()
+ let thumbnailUrl = webserverUrl + video.getPreviewStaticPath()
let embedWidth = EMBED_SIZE.width
let embedHeight = EMBED_SIZE.height
@@ -45,7 +44,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
thumbnailUrl = undefined
}
- const html = ``
+ const html = ``
const json: any = {
type: 'video',
@@ -55,6 +55,7 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
height: embedHeight,
title: video.name,
author_name: video.VideoChannel.Account.name,
+ author_url: video.VideoChannel.Account.Actor.url,
provider_name: 'PeerTube',
provider_url: webserverUrl
}