Merge pull request #786 from MartinZikmund/feature/youtube-short-support

Support for YouTube Shorts embedding
xoofx · Apr 9, 2024 · 1a1bbec · 1a1bbec
2 parents 8e22754 + 68bd307
commit 1a1bbec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Markdig.Tests/TestMediaLinks.cs b/src/Markdig.Tests/TestMediaLinks.cs
@@ -25,6 +25,7 @@ private MarkdownPipeline GetPipelineWithBootstrap(MediaOptions options = null)
     [Test]
     [TestCase("![static mp4](https://sample.com/video.mp4)", "<p><video width=\"500\" height=\"281\" controls=\"\"><source type=\"video/mp4\" src=\"https://sample.com/video.mp4\"></source></video></p>\n")]
     [TestCase("![static mp4](//sample.com/video.mp4)", "<p><video width=\"500\" height=\"281\" controls=\"\"><source type=\"video/mp4\" src=\"//sample.com/video.mp4\"></source></video></p>\n")]
+    [TestCase(@"![youtube short](https://www.youtube.com/shorts/6BUptHVuvyI?feature=share)", "<p><iframe src=\"https://www.youtube.com/embed/6BUptHVuvyI\" class=\"youtubeshort\" width=\"500\" height=\"281\" frameborder=\"0\" allowfullscreen=\"\"></iframe></p>\n")]
     [TestCase(@"![youtube.com](https://www.youtube.com/watch?v=mswPy5bt3TQ)", "<p><iframe src=\"https://www.youtube.com/embed/mswPy5bt3TQ\" class=\"youtube\" width=\"500\" height=\"281\" frameborder=\"0\" allowfullscreen=\"\"></iframe></p>\n")]
     [TestCase("![yandex.ru](https://music.yandex.ru/album/411845/track/4402274)", "<p><iframe src=\"https://music.yandex.ru/iframe/#track/4402274/411845/\" class=\"yandex\" width=\"500\" height=\"281\" frameborder=\"0\"></iframe></p>\n")]
     [TestCase("![vimeo](https://vimeo.com/8607834)", "<p><iframe src=\"https://player.vimeo.com/video/8607834\" class=\"vimeo\" width=\"500\" height=\"281\" frameborder=\"0\" allowfullscreen=\"\"></iframe></p>\n")]
@@ -33,7 +34,7 @@ private MarkdownPipeline GetPipelineWithBootstrap(MediaOptions options = null)
     public void TestBuiltInHosts(string markdown, string expected)
     {
         string html = Markdown.ToHtml(markdown, GetPipeline());
-        Assert.AreEqual(html, expected);
+        Assert.AreEqual(expected, html);
     }
 
     [TestCase("![static video relative path](./video.mp4)",
@@ -43,7 +44,7 @@ public void TestBuiltInHosts(string markdown, string expected)
     public void TestBuiltInHostsWithRelativePaths(string markdown, string expected)
     {
         string html = Markdown.ToHtml(markdown, GetPipeline());
-        Assert.AreEqual(html, expected);
+        Assert.AreEqual(expected, html);
     }
 
     private class TestHostProvider : IHostProvider

diff --git a/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs b/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs
@@ -58,6 +58,7 @@ public static IHostProvider Create(string hostPrefix, Func<Uri, string?> handler
     internal static Dictionary<string, IHostProvider> KnownHosts { get; }
         = new Dictionary<string, IHostProvider>(StringComparer.OrdinalIgnoreCase)
         {
+            ["YouTubeShort"] = Create("www.youtube.com", YouTubeShort, iframeClass: "youtubeshort"),
             ["YouTube"] = Create("www.youtube.com", YouTube, iframeClass: "youtube"),
             ["YouTubeShortened"] = Create("youtu.be", YouTubeShortened, iframeClass: "youtube"),
             ["Vimeo"] = Create("vimeo.com", Vimeo, iframeClass: "vimeo"),
@@ -92,6 +93,19 @@ private static string[] SplitQuery(Uri uri)
         );
     }
 
+    private static string? YouTubeShort(Uri uri)
+    {
+        string uriPath = uri.AbsolutePath;
+        bool isYouTubeShort = uriPath.StartsWith("/shorts/", StringComparison.OrdinalIgnoreCase);
+        if (!isYouTubeShort)
+        {
+            return null;
+        }
+
+        var shortId = uriPath.Substring("/shorts/".Length).Split('?').FirstOrDefault(); // the format might be "/shorts/6BUptHVuvyI?feature=share"
+        return BuildYouTubeIframeUrl(shortId, null);
+    }
+
     private static string? YouTubeShortened(Uri uri)
     {
         return BuildYouTubeIframeUrl(