X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fcontrollers%2Fservices.ts;h=9151e1b04e73b64a9e0e2e10cc43729cb4c1e277;hb=bae616273d455d225d131eb17c56db6c20a0b6b3;hp=4bbe56a8a6b1c16e47dbba265037da46cec87483;hpb=164174a6abac3e391e95d479a98749e20eb86f34;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/server/controllers/services.ts b/server/controllers/services.ts
index 4bbe56a8a..9151e1b04 100644
--- a/server/controllers/services.ts
+++ b/server/controllers/services.ts
@@ -1,12 +1,20 @@
-import * as express from 'express'
-
-import { CONFIG, PREVIEWS_SIZE, EMBED_SIZE } from '../initializers'
-import { oembedValidator } from '../middlewares'
-import { VideoInstance } from '../models'
+import express from 'express'
+import { EMBED_SIZE, PREVIEWS_SIZE, WEBSERVER, THUMBNAILS_SIZE } from '../initializers/constants'
+import { asyncMiddleware, oembedValidator } from '../middlewares'
+import { accountNameWithHostGetValidator } from '../middlewares/validators'
+import { MChannelSummary } from '@server/types/models'
+import { escapeHTML } from '@shared/core-utils/renderer'
const servicesRouter = express.Router()
-servicesRouter.use('/oembed', oembedValidator, generateOEmbed)
+servicesRouter.use('/oembed',
+ asyncMiddleware(oembedValidator),
+ generateOEmbed
+)
+servicesRouter.use('/redirect/accounts/:accountName',
+ asyncMiddleware(accountNameWithHostGetValidator),
+ redirectToAccountUrl
+)
// ---------------------------------------------------------------------------
@@ -16,29 +24,82 @@ export {
// ---------------------------------------------------------------------------
-function generateOEmbed (req: express.Request, res: express.Response, next: express.NextFunction) {
- const video = res.locals.video as VideoInstance
- const webserverUrl = CONFIG.WEBSERVER.URL
+function generateOEmbed (req: express.Request, res: express.Response) {
+ if (res.locals.videoAll) return generateVideoOEmbed(req, res)
+
+ return generatePlaylistOEmbed(req, res)
+}
+
+function generatePlaylistOEmbed (req: express.Request, res: express.Response) {
+ const playlist = res.locals.videoPlaylistSummary
+
+ const json = buildOEmbed({
+ channel: playlist.VideoChannel,
+ title: playlist.name,
+ embedPath: playlist.getEmbedStaticPath(),
+ previewPath: playlist.getThumbnailStaticPath(),
+ previewSize: THUMBNAILS_SIZE,
+ req
+ })
+
+ return res.json(json)
+}
+
+function generateVideoOEmbed (req: express.Request, res: express.Response) {
+ const video = res.locals.videoAll
+
+ const json = buildOEmbed({
+ channel: video.VideoChannel,
+ title: video.name,
+ embedPath: video.getEmbedStaticPath(),
+ previewPath: video.getPreviewStaticPath(),
+ previewSize: PREVIEWS_SIZE,
+ req
+ })
+
+ return res.json(json)
+}
+
+function buildOEmbed (options: {
+ req: express.Request
+ title: string
+ channel: MChannelSummary
+ previewPath: string | null
+ embedPath: string
+ previewSize: {
+ height: number
+ width: number
+ }
+}) {
+ const { req, previewSize, previewPath, title, channel, embedPath } = options
+
+ 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 + embedPath
+ const embedTitle = escapeHTML(title)
+
+ let thumbnailUrl = previewPath
+ ? webserverUrl + previewPath
+ : undefined
+
let embedWidth = EMBED_SIZE.width
- let embedHeight = EMBED_SIZE.height
+ if (maxWidth < embedWidth) embedWidth = maxWidth
+ let embedHeight = EMBED_SIZE.height
if (maxHeight < embedHeight) embedHeight = maxHeight
- if (maxWidth < embedWidth) embedWidth = maxWidth
// Our thumbnail is too big for the consumer
if (
- (maxHeight !== undefined && maxHeight < PREVIEWS_SIZE.height) ||
- (maxWidth !== undefined && maxWidth < PREVIEWS_SIZE.width)
+ (maxHeight !== undefined && maxHeight < previewSize.height) ||
+ (maxWidth !== undefined && maxWidth < previewSize.width)
) {
thumbnailUrl = undefined
}
- const html = ``
+ const html = ``
const json: any = {
type: 'video',
@@ -46,17 +107,22 @@ function generateOEmbed (req: express.Request, res: express.Response, next: expr
html,
width: embedWidth,
height: embedHeight,
- title: video.name,
- author_name: video.Author.name,
+ title: title,
+ author_name: channel.name,
+ author_url: channel.Actor.url,
provider_name: 'PeerTube',
provider_url: webserverUrl
}
if (thumbnailUrl !== undefined) {
json.thumbnail_url = thumbnailUrl
- json.thumbnail_width = PREVIEWS_SIZE.width
- json.thumbnail_height = PREVIEWS_SIZE.height
+ json.thumbnail_width = previewSize.width
+ json.thumbnail_height = previewSize.height
}
- return res.json(json)
+ return json
+}
+
+function redirectToAccountUrl (req: express.Request, res: express.Response, next: express.NextFunction) {
+ return res.redirect(res.locals.account.Actor.url)
}