From 384649fe41971c867e7bf9c7bc95028d70288447 Mon Sep 17 00:00:00 2001
From: Manuel Maier <manuel@morethings.digital>
Date: Tue, 13 Feb 2024 21:42:04 +0100
Subject: [PATCH] [4.x] Support YouTube Shorts in embed_code modifier (#9521)

---
 src/Modifiers/CoreModifiers.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 1bdf818646..5858cae1d1 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -2909,10 +2909,19 @@ public function embedUrl($url)
             }
         }
 
+        if (Str::contains($url, 'youtube.com/shorts/')) {
+            $url = str_replace('shorts/', 'embed/', $url);
+        }
+
         if (Str::contains($url, 'youtube.com')) {
             $url = str_replace('youtube.com', 'youtube-nocookie.com', $url);
         }
 
+        // This avoids SSL issues when using the non-www version
+        if (Str::contains($url, '//youtube-nocookie.com')) {
+            $url = str_replace('//youtube-nocookie.com', '//www.youtube-nocookie.com', $url);
+        }
+
         return $url;
     }