From 4211d6f90779c8d4747a679c80627569b9366915 Mon Sep 17 00:00:00 2001 From: uduki Date: Wed, 9 Sep 2026 18:37:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20Senzuri/TXXX/HClips/Upornia/YouJizz?= =?UTF-8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=A9=E3=82=A4=E3=83=B3=E5=85=AC?= =?UTF-8?q?=E5=BC=8Fembed=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BF=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E5=AF=BE=E5=BF=9C=E3=81=8A?= =?UTF-8?q?=E3=82=88=E3=81=B3URL=E8=87=AA=E5=8B=95=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Class/Renderers/HtmlRenderer.cs | 24 ++++++++++++--- WebImageViewer/Program.cs | 30 +++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/WebImageViewer/Class/Renderers/HtmlRenderer.cs b/WebImageViewer/Class/Renderers/HtmlRenderer.cs index 8ff167d..00cce5e 100644 --- a/WebImageViewer/Class/Renderers/HtmlRenderer.cs +++ b/WebImageViewer/Class/Renderers/HtmlRenderer.cs @@ -1823,6 +1823,7 @@ public static class HtmlRenderer accentPrimary = "#f10048"; glowColor = "rgba(241, 0, 72, 0.3)"; defaultOrigUrl = $"https://upornia.com/videos/{safeId}/"; + playerUrl ??= $"https://upornia.com/embed/{safeId}/"; break; case "xvideos": @@ -1832,6 +1833,17 @@ public static class HtmlRenderer accentPrimary = "#dc2626"; glowColor = "rgba(220, 38, 38, 0.3)"; defaultOrigUrl = $"https://www.xvideos.com/video.{safeId}/"; + playerUrl ??= $"https://www.xvideos.com/embedframe/{safeId}"; + break; + + case "youjizz": + siteDisplayName = "YouJizz"; + badgeText = "YOUJIZZ VIDEO"; + accentGradient = "linear-gradient(135deg, #0ea5e9 0%, #6366f1 100%)"; + accentPrimary = "#0ea5e9"; + glowColor = "rgba(14, 165, 233, 0.3)"; + defaultOrigUrl = $"https://www.youjizz.com/videos/{safeId}.html"; + playerUrl ??= $"https://www.youjizz.com/embed/{safeId}"; break; case "eroterest": @@ -1882,19 +1894,23 @@ public static class HtmlRenderer accentPrimary = "#8b5cf6"; glowColor = "rgba(139, 92, 246, 0.3)"; defaultOrigUrl = originalUrl ?? $"https://senzuri.tube/videos/{safeId}/"; + playerUrl ??= $"https://senzuri.tube/embed/{safeId}/"; break; case "txxx": case "txxx.com": case "hclips": case "hclips.com": - siteDisplayName = "TXXX"; - badgeText = "TXXX VIDEO"; + case "hdzog": + case "hdzog.com": + bool isHclips = normalizedSite.Contains("hclips") || (originalUrl != null && originalUrl.Contains("hclips.com", StringComparison.OrdinalIgnoreCase)); + siteDisplayName = isHclips ? "HClips" : "TXXX"; + badgeText = isHclips ? "HCLIPS VIDEO" : "TXXX VIDEO"; accentGradient = "linear-gradient(135deg, #ef4444 0%, #f97316 100%)"; accentPrimary = "#ef4444"; glowColor = "rgba(239, 68, 68, 0.3)"; - defaultOrigUrl = originalUrl ?? $"https://www.txxx.com/videos/{safeId}/"; - playerUrl ??= $"https://www.txxx.com/embed/{safeId}/"; + defaultOrigUrl = originalUrl ?? (isHclips ? $"https://www.hclips.com/videos/{safeId}/" : $"https://www.txxx.com/videos/{safeId}/"); + playerUrl ??= isHclips ? $"https://www.hclips.com/embed/{safeId}/" : $"https://www.txxx.com/embed/{safeId}/"; break; case "fc2": diff --git a/WebImageViewer/Program.cs b/WebImageViewer/Program.cs index d95f158..5315010 100644 --- a/WebImageViewer/Program.cs +++ b/WebImageViewer/Program.cs @@ -152,6 +152,36 @@ app.MapGet("/video", (string? url, string? id, string? site, string? play, strin return Results.Content(HtmlRenderer.RenderVideoPlayer("doga", vId, play, stream, orig, title ?? $"エロタレドーガ ({vId})"), "text/html; charset=utf-8"); } + // target が URL で site 未指定の場合のドメイン自動判定 + if (string.IsNullOrWhiteSpace(site) && target != null) + { + if (target.Contains("senzuri.tube", StringComparison.OrdinalIgnoreCase)) + { + site = "senzuri"; + id ??= System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value; + } + else if (target.Contains("txxx.com", StringComparison.OrdinalIgnoreCase)) + { + site = "txxx"; + id ??= System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value; + } + else if (target.Contains("hclips.com", StringComparison.OrdinalIgnoreCase)) + { + site = "hclips"; + id ??= System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value; + } + else if (target.Contains("upornia.com", StringComparison.OrdinalIgnoreCase)) + { + site = "upornia"; + id ??= System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value; + } + else if (target.Contains("youjizz.com", StringComparison.OrdinalIgnoreCase)) + { + site = "youjizz"; + id ??= System.Text.RegularExpressions.Regex.Match(target, @"/videos/([0-9]+)").Groups[1].Value; + } + } + // stream (HLS m3u8 / MP4 等) または play (iframe player) が渡されている場合、または site が指定されている場合 if (!string.IsNullOrWhiteSpace(stream) || !string.IsNullOrWhiteSpace(play) || !string.IsNullOrWhiteSpace(site)) {