From ae948e41a7327f4fab38d29b68ac2fc26d7ea724 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller-moko@noreply.git.mokoconsulting.tech>
Date: Thu, 28 May 2026 15:12:52 -0500
Subject: [PATCH] feat: smart video URL detection for YouTube, Vimeo, and local
 files

The video field now accepts any URL format and auto-detects the source:
- YouTube: watch, embed, shorts, youtu.be (extracts video ID)
- Vimeo: vimeo.com/ID, player.vimeo.com/video/ID
- Local/direct: relative paths or direct URLs render as <video>

Also fix videoFile filter from url to string to allow local paths.

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/language/en-GB/mod_mokojoomhero.sys.ini |  4 ++--
 src/mod_mokojoomhero.php                    | 11 ++++++++---
 src/tmpl/default.php                        |  5 ++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/language/en-GB/mod_mokojoomhero.sys.ini b/src/language/en-GB/mod_mokojoomhero.sys.ini
index 4d3533e..3753a64 100644
--- a/src/language/en-GB/mod_mokojoomhero.sys.ini
+++ b/src/language/en-GB/mod_mokojoomhero.sys.ini
@@ -27,8 +27,8 @@ MOD_MOKOJOOMHERO_SLIDE_INTERVAL_LABEL="Slide Interval (ms)"
 MOD_MOKOJOOMHERO_SLIDE_INTERVAL_DESC="Time between slides in milliseconds (e.g. 5000 = 5 seconds)."
 
 ; Video settings
-MOD_MOKOJOOMHERO_VIDEO_FILE_LABEL="Video File / YouTube URL"
-MOD_MOKOJOOMHERO_VIDEO_FILE_DESC="Path to a local video file (MP4), or a YouTube URL (e.g. https://www.youtube.com/watch?v=abc123)."
+MOD_MOKOJOOMHERO_VIDEO_FILE_LABEL="Video URL"
+MOD_MOKOJOOMHERO_VIDEO_FILE_DESC="Local file path, YouTube URL, or Vimeo URL. Any format works — the module auto-detects the source."
 
 ; Hero height
 MOD_MOKOJOOMHERO_HERO_HEIGHT_LABEL="Hero Height"
diff --git a/src/mod_mokojoomhero.php b/src/mod_mokojoomhero.php
index a03804c..77b4e95 100644
--- a/src/mod_mokojoomhero.php
+++ b/src/mod_mokojoomhero.php
@@ -60,15 +60,20 @@ if ($heroMode === 'images') {
     }
 }
 
-// Build video URL — detect YouTube vs local file
+// Build video URL — smartly detect YouTube, Vimeo, or local/direct file
 $videoUrl   = '';
 $youtubeId  = '';
+$vimeoId    = '';
 
 if ($heroMode === 'video' && $videoFile) {
-    // Match youtube.com/watch?v=ID, youtu.be/ID, youtube.com/embed/ID
-    if (preg_match('/(?:youtube\.com\/(?:watch\?v=|embed\/)|youtu\.be\/)([\w-]{11})/', $videoFile, $m)) {
+    // YouTube: watch, embed, shorts, youtu.be, with optional timestamps/params
+    if (preg_match('/(?:youtube\.com\/(?:watch\?.*v=|embed\/|shorts\/|v\/)|youtu\.be\/)([\w-]{11})/', $videoFile, $m)) {
         $youtubeId = $m[1];
+    // Vimeo: vimeo.com/123456 or player.vimeo.com/video/123456
+    } elseif (preg_match('/vimeo\.com\/(?:video\/)?(\d+)/', $videoFile, $m)) {
+        $vimeoId = $m[1];
     } else {
+        // Direct URL or local file path
         $videoUrl = (strpos($videoFile, '://') !== false)
             ? $videoFile
             : Uri::root() . ltrim($videoFile, '/');
diff --git a/src/tmpl/default.php b/src/tmpl/default.php
index 5ed6791..855d0f1 100644
--- a/src/tmpl/default.php
+++ b/src/tmpl/default.php
@@ -17,6 +17,7 @@ use Joomla\CMS\Language\Text;
 /** @var int    $slideInterval */
 /** @var string $videoUrl */
 /** @var string $youtubeId */
+/** @var string $vimeoId */
 /** @var string $heroHeight */
 /** @var string $overlayColor */
 /** @var float  $overlayOpacity */
@@ -42,7 +43,9 @@ $heightAttr = htmlspecialchars($heroHeight, ENT_QUOTES, 'UTF-8');
 >
 	<?php // Background layer — single image, slideshow, or video ?>
 	<?php if ($heroMode === 'video' && $youtubeId) : ?>
-		<iframe class="mokojoomhero__video" src="https://www.youtube-nocookie.com/embed/<?php echo htmlspecialchars($youtubeId, ENT_QUOTES, 'UTF-8'); ?>?autoplay=1&mute=1&loop=1&playlist=<?php echo htmlspecialchars($youtubeId, ENT_QUOTES, 'UTF-8'); ?>&controls=0&showinfo=0&rel=0&modestbranding=1&playsinline=1" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+		<iframe class="mokojoomhero__video" src="https://www.youtube-nocookie.com/embed/<?php echo htmlspecialchars($youtubeId, ENT_QUOTES, 'UTF-8'); ?>?autoplay=1&mute=1&loop=1&playlist=<?php echo htmlspecialchars($youtubeId, ENT_QUOTES, 'UTF-8'); ?>&controls=0&showinfo=0&rel=0&modestbranding=1&playsinline=1" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+	<?php elseif ($heroMode === 'video' && $vimeoId) : ?>
+		<iframe class="mokojoomhero__video" src="https://player.vimeo.com/video/<?php echo htmlspecialchars($vimeoId, ENT_QUOTES, 'UTF-8'); ?>?autoplay=1&muted=1&loop=1&background=1" allow="autoplay" allowfullscreen></iframe>
 	<?php elseif ($heroMode === 'video' && $videoUrl) : ?>
 		<video class="mokojoomhero__video" autoplay muted loop playsinline>
 			<source src="<?php echo htmlspecialchars($videoUrl, ENT_QUOTES, 'UTF-8'); ?>">