Vimeo fix

funnel/assets/js/utils/embedvideo.js

@@ -8,14 +8,22 @@ const Video = {
   */
   getVideoTypeAndId(url) {
     const regexMatch = url.match(
-      /(http:|https:|)\/\/(player.|www.)?(y2u\.be|vimeo\.com|youtu(be\.com|\.be|be\.googleapis\.com))\/(video\/|embed\/|live\/|watch\?v=|v\/)?([A-Za-z0-9._%-]*)(&\S+)?/
+      /(http:|https:|)\/\/(player.|www.)?(?<service>y2u\.be|vimeo\.com|youtu(be\.com|\.be|be\.googleapis\.com))\/(video\/|embed\/|live\/|watch\?v=|v\/)?(?<videoId>[A-Za-z0-9._%-]*)(&\S+)?(\?h=(?<paramId>[^&]+))?/
     );
     let type = '';
     if (regexMatch && regexMatch.length > 5) {
-      if (regexMatch[3].indexOf('youtu') > -1 || regexMatch[3].indexOf('y2u') > -1) {
+      if (
+        regexMatch.groups.service.indexOf('youtu') > -1 ||
+        regexMatch.groups.service.indexOf('y2u') > -1
+      ) {
         type = 'youtube';
-      } else if (regexMatch[3].indexOf('vimeo') > -1) {
+      } else if (regexMatch.groups.service.indexOf('vimeo') > -1) {
         type = 'vimeo';
+        return {
+          type,
+          videoId: regexMatch.groups.videoId,
+          paramId: regexMatch.groups.paramId,
+        };
       }
       return {
         type,
@@ -29,11 +37,13 @@ const Video = {
   },
   embedIframe(videoWrapper, videoUrl) {
     let videoEmbedUrl = '';
-    const { type, videoId } = this.getVideoTypeAndId(videoUrl);
+    const { type, videoId, paramId } = this.getVideoTypeAndId(videoUrl);
     if (type === 'youtube') {
       videoEmbedUrl = `<iframe src='//www.youtube.com/embed/${videoId}' frameborder='0' allowfullscreen></iframe>`;
     } else if (type === 'vimeo') {
-      videoEmbedUrl = `<iframe src='https://player.vimeo.com/video/${videoId}' frameborder='0' allowfullscreen></iframe>`;
+      videoEmbedUrl = `<iframe src='https://player.vimeo.com/video/${videoId}${
+        paramId ? `?h=${paramId}` : ''
+      }' frameborder='0' allowfullscreen></iframe>`;
     }
     if (videoEmbedUrl) {
       videoWrapper.innerHTML = videoEmbedUrl;

funnel/forms/project.py

@@ -166,6 +166,7 @@ class ProjectLivestreamForm(forms.Form):
                             'y2u.be',
                             'www.vimeo.com',
                             'vimeo.com',
+                            'player.vimeo.com',
                         ),
                         message_schemes=__("A https:// URL is required"),
                         message_domains=__("Livestream must be on YouTube or Vimeo"),