projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(well-known url) add change-password
[oweals/peertube.git]
/
server
/
controllers
/
services.ts
diff --git
a/server/controllers/services.ts
b/server/controllers/services.ts
index a58a5b8cf2b49a068de56f2480b2e39271198c4c..352d0b19a8bb096c7e26d800fe5be499c4044573 100644
(file)
--- a/
server/controllers/services.ts
+++ b/
server/controllers/services.ts
@@
-29,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 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.getEmbed
Static
Path()
+ let thumbnailUrl = webserverUrl + video.getPreview
Static
Path()
let embedWidth = EMBED_SIZE.width
let embedHeight = EMBED_SIZE.height
let embedWidth = EMBED_SIZE.width
let embedHeight = EMBED_SIZE.height
@@
-45,7
+45,8
@@
function generateOEmbed (req: express.Request, res: express.Response, next: expr
thumbnailUrl = undefined
}
thumbnailUrl = undefined
}
- const html = `<iframe width="${embedWidth}" height="${embedHeight}" src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
+ const html = `<iframe width="${embedWidth}" height="${embedHeight}" sandbox="allow-same-origin allow-scripts" ` +
+ `src="${embedUrl}" frameborder="0" allowfullscreen></iframe>`
const json: any = {
type: 'video',
const json: any = {
type: 'video',
@@
-55,6
+56,7
@@
function generateOEmbed (req: express.Request, res: express.Response, next: expr
height: embedHeight,
title: video.name,
author_name: video.VideoChannel.Account.name,
height: embedHeight,
title: video.name,
author_name: video.VideoChannel.Account.name,
+ author_url: video.VideoChannel.Account.Actor.url,
provider_name: 'PeerTube',
provider_url: webserverUrl
}
provider_name: 'PeerTube',
provider_url: webserverUrl
}