EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3152 from dpalou/MOBILE-4005 

MOBILE-4005 vimeo: Support privacy hash in vimeo URL
main
Pau Ferrer Ocaña 2022-03-07 11:55:42 +01:00 committed by GitHub
parent eb82778cd7 4b55774497
commit a6be0d1a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/directives/format-text.ts
View File

@ -797,11 +797,22 @@ export class CoreFormatTextDirective implements OnChanges {
if (site && src) { if (site && src) {
// Check if it's a Vimeo video. If it is, use the wsplayer script instead to make restricted videos work. // Check if it's a Vimeo video. If it is, use the wsplayer script instead to make restricted videos work.
const matches = iframe.src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)/); const matches = src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)([?&]+h=([a-zA-Z0-9]*))?/);
if (matches && matches[1]) { if (matches && matches[1]) {
let newUrl = CoreTextUtils.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') + let newUrl = CoreTextUtils.concatenatePaths(site.getURL(), '/media/player/vimeo/wsplayer.php?video=') +
matches[1] + '&token=' + site.getToken(); matches[1] + '&token=' + site.getToken();
let privacyHash: string | undefined | null = matches[3];
if (!privacyHash) {
// No privacy hash using the new format. Check the legacy format.
const matches = src.match(/https?:\/\/player\.vimeo\.com\/video\/([0-9]+)(\/([a-zA-Z0-9]+))?/);
privacyHash = matches && matches[3];
}
if (privacyHash) {
newUrl += `&h=${privacyHash}`;
}
// Width and height are mandatory, we need to calculate them. // Width and height are mandatory, we need to calculate them.
let width: string | number; let width: string | number;
let height: string | number; let height: string | number;
@ -829,7 +840,7 @@ export class CoreFormatTextDirective implements OnChanges {
newUrl += '&width=' + width + '&height=' + height; newUrl += '&width=' + width + '&height=' + height;
} }
await CoreIframeUtils.fixIframeCookies(src); await CoreIframeUtils.fixIframeCookies(newUrl);
iframe.src = newUrl; iframe.src = newUrl;