diff options
| author | RblSb <msrblsb@gmail.com> | 2021-01-31 19:42:11 +0300 |
|---|---|---|
| committer | RblSb <msrblsb@gmail.com> | 2021-01-31 19:43:34 +0300 |
| commit | 8128d9d29ebdd4d64b44194b9bdb75cb888c3176 (patch) | |
| tree | d20a6c5e4f96c7e17843b93b5a579512a8be6a60 /res | |
| parent | 8e603b7161b19a1035616b71c5b572577ac24317 (diff) | |
Improve youtube link detection
Diffstat (limited to 'res')
| -rw-r--r-- | res/client.js | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/res/client.js b/res/client.js index 4ea4fd7..0f339f6 100644 --- a/res/client.js +++ b/res/client.js @@ -2599,9 +2599,9 @@ var client_players_Youtube = function(main,player) { this.playlistUrl = "https://www.googleapis.com/youtube/v3/playlistItems"; this.videosUrl = "https://www.googleapis.com/youtube/v3/videos"; this.matchPlaylist = new EReg("youtube\\.com.*list=([A-z0-9_-]+)",""); - this.matchEmbed = new EReg("embed/([A-z0-9_-]+)",""); - this.matchShort = new EReg("youtu.be/([A-z0-9_-]+)",""); - this.matchId = new EReg("v=([A-z0-9_-]+)",""); + this.matchEmbed = new EReg("youtube\\.com/embed/([A-z0-9_-]+)",""); + this.matchShort = new EReg("youtu\\.be/([A-z0-9_-]+)",""); + this.matchId = new EReg("youtube\\.com.*v=([A-z0-9_-]+)",""); this.main = main; this.player = player; }; @@ -2615,18 +2615,16 @@ client_players_Youtube.prototype = { } } ,extractVideoId: function(url) { - if(url.indexOf("youtu.be/") != -1) { - this.matchShort.match(url); + if(this.matchId.match(url)) { + return this.matchId.matched(1); + } + if(this.matchShort.match(url)) { return this.matchShort.matched(1); } - if(url.indexOf("youtube.com/embed/") != -1) { - this.matchEmbed.match(url); + if(this.matchEmbed.match(url)) { return this.matchEmbed.matched(1); } - if(!this.matchId.match(url)) { - return ""; - } - return this.matchId.matched(1); + return ""; } ,extractPlaylistId: function(url) { if(!this.matchPlaylist.match(url)) { |