X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fservices.ts;h=352d0b19a8bb096c7e26d800fe5be499c4044573;hb=1d6587aa42ddaa5acdf3a99127797377c7717850;hp=3ac78a5df7c0149e2d2de68d9f0ed2ff8a771bf3;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 3ac78a5df..352d0b19a 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,6 +1,7 @@
import * as express from 'express'
import { CONFIG, EMBED_SIZE, PREVIEWS_SIZE } from '../initializers'
import { asyncMiddleware, oembedValidator } from '../middlewares'
+import { accountsNameWithHostGetValidator } from '../middlewares/validators'
import { VideoModel } from '../models/video/video'
const servicesRouter = express.Router()
@@ -9,6 +10,10 @@ servicesRouter.use('/oembed',
asyncMiddleware(oembedValidator),
generateOEmbed
)
+servicesRouter.use('/redirect/accounts/:accountName',
+ asyncMiddleware(accountsNameWithHostGetValidator),
+ redirectToAccountUrl
+)
// ---------------------------------------------------------------------------
@@ -24,8 +29,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
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
@@ -40,7 +45,8 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
thumbnailUrl = undefined
}
- const html = ``
+ const html = ``
const json: any = {
type: 'video',
@@ -50,6 +56,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
}
@@ -62,3 +69,7 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
return res.json(json)
}
+
+function redirectToAccountUrl (req: express.Request, res: express.Response, next: express.NextFunction) {
+ return res.redirect(res.locals.account.Actor.url)
+}