diff --git a/WebImageViewer/Class/Renderers/HtmlRenderer.cs b/WebImageViewer/Class/Renderers/HtmlRenderer.cs
index 3710344..73d716c 100644
--- a/WebImageViewer/Class/Renderers/HtmlRenderer.cs
+++ b/WebImageViewer/Class/Renderers/HtmlRenderer.cs
@@ -1250,7 +1250,7 @@ public static class HtmlRenderer
@@ -1270,6 +1270,8 @@ public static class HtmlRenderer
+
+
@@ -1341,19 +1343,19 @@ public static class HtmlRenderer
@@ -1410,33 +1432,43 @@ public static class HtmlRenderer
}
}
- // SpankBangのURLまたはIDからIDを抽出する関数
- function extractSpankBangId(str) {
- if (!str) return null;
- str = str.trim();
- // https://jp.spankbang.com/{id}/video/... または /embed/ または /play/
- const urlMatch = str.match(/spankbang\.(?:com|party)\/([a-z0-9]+)(?:\/(?:video|play|embed)|\/|$)/i);
- if (urlMatch) return urlMatch[1];
- // spankbang/{id}
- const pathMatch = str.match(/^spankbang\/([a-z0-9]+)/i);
- if (pathMatch) return pathMatch[1];
- // IDのみ (例: 56b3d)
- const idMatch = str.match(/^[a-z0-9]{3,12}$/i);
- if (idMatch) return idMatch[0];
- return null;
+ // 動画URL/IDの判定と遷移
+ function navigateVideoInput(input) {
+ if (!input) return;
+ input = input.trim();
+
+ // 123av判定
+ if (input.toLowerCase().includes('123av')) {
+ const match = input.match(/(?:123av\.com\/[a-z]{2}\/(?:video\/)?|^123av\/)([^/?#]+)/i);
+ const id = match ? match[1] : input.replace(/^123av\//i, '').replace(/^\/+|\/+$/g, '');
+ window.location.href = '/123av/' + encodeURIComponent(id);
+ return;
+ }
+
+ // missav判定
+ if (input.toLowerCase().includes('missav')) {
+ const match = input.match(/(?:missav\.[a-z]+\/[a-z]{2}\/|^missav\/)([^/?#]+)/i);
+ const id = match ? match[1] : input.replace(/^missav\//i, '').replace(/^\/+|\/+$/g, '');
+ window.location.href = '/missav/' + encodeURIComponent(id);
+ return;
+ }
+
+ // SpankBang判定
+ const sbMatch = input.match(/spankbang\.(?:com|party)\/([a-z0-9]+)(?:\/(?:video|play|embed)|\/|$)/i) || input.match(/^spankbang\/([a-z0-9]+)/i);
+ if (sbMatch) {
+ window.location.href = '/spankbang/' + encodeURIComponent(sbMatch[1]);
+ return;
+ }
+
+ // デフォルト: 汎用 /video
+ window.location.href = '/video?url=' + encodeURIComponent(input);
}
// 動画用フォーム送信イベント
document.getElementById('videoForm').addEventListener('submit', function(e) {
e.preventDefault();
const input = document.getElementById('videoUrlInput').value.trim();
- if (!input) return;
- const id = extractSpankBangId(input);
- if (id) {
- window.location.href = '/spankbang/' + id;
- } else {
- window.location.href = '/video?url=' + encodeURIComponent(input);
- }
+ navigateVideoInput(input);
});
// 画像用フォーム送信イベント
@@ -1446,10 +1478,22 @@ public static class HtmlRenderer
const siteSelect = document.getElementById('siteSelect').value;
if (!input) return;
- // SpankBang の判定(画像入力フォームに入力された場合でも自動遷移)
- const sbId = extractSpankBangId(input);
- if (sbId && (input.includes('spankbang') || siteSelect === 'spankbang')) {
- window.location.href = '/spankbang/' + sbId;
+ // 動画サイト選択または動画URLの判定
+ if (siteSelect === 'spankbang' || siteSelect === '123av' || siteSelect === 'missav' ||
+ input.toLowerCase().includes('spankbang') || input.toLowerCase().includes('123av') || input.toLowerCase().includes('missav')) {
+ if (siteSelect === '123av' && !input.toLowerCase().includes('123av')) {
+ window.location.href = '/123av/' + encodeURIComponent(input);
+ return;
+ }
+ if (siteSelect === 'missav' && !input.toLowerCase().includes('missav')) {
+ window.location.href = '/missav/' + encodeURIComponent(input);
+ return;
+ }
+ if (siteSelect === 'spankbang' && !input.toLowerCase().includes('spankbang')) {
+ window.location.href = '/spankbang/' + encodeURIComponent(input);
+ return;
+ }
+ navigateVideoInput(input);
return;
}
@@ -1628,13 +1672,79 @@ public static class HtmlRenderer
}
///
- /// SpankBang動画プレイヤー画面のHTMLを生成します。
+ /// SpankBang動画プレイヤー画面のHTMLを生成します(後方互換用)。
///
public static string RenderVideoPlayer(string videoId, string? originalUrl = null)
{
- var safeId = Encoder.Encode(videoId);
- var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : $"https://jp.spankbang.com/{safeId}/video/";
+ var safeId = videoId.Trim();
+ var origUrl = !string.IsNullOrWhiteSpace(originalUrl) ? originalUrl : $"https://jp.spankbang.com/{safeId}/video/";
var embedUrl = $"https://spankbang.com/{safeId}/embed/";
+ return RenderVideoPlayer("spankbang", safeId, embedUrl, null, origUrl, $"SpankBang 動画 ({safeId})");
+ }
+
+ ///
+ /// 各種動画サイト(SpankBang, 123av, missav等)に対応したプレミアム動画プレイヤー画面のHTMLを生成します。
+ ///
+ public static string RenderVideoPlayer(
+ string site,
+ string videoId,
+ string? playerUrl = null,
+ string? streamUrl = null,
+ string? originalUrl = null,
+ string? title = null)
+ {
+ var normalizedSite = (site ?? "video").Trim().ToLowerInvariant();
+ var safeId = Encoder.Encode(videoId.Trim());
+
+ // サイト別の設定(名称、バッジ、グラデーション、プライマリカラー)
+ string siteDisplayName;
+ string badgeText;
+ string accentGradient;
+ string accentPrimary;
+ string glowColor;
+ string defaultOrigUrl;
+
+ switch (normalizedSite)
+ {
+ case "123av":
+ siteDisplayName = "123av";
+ badgeText = "123AV VIDEO";
+ accentGradient = "linear-gradient(135deg, #6366f1 0%, #3b82f6 100%)";
+ accentPrimary = "#6366f1";
+ glowColor = "rgba(99, 102, 241, 0.3)";
+ defaultOrigUrl = $"https://123av.com/ja/video/{safeId}";
+ playerUrl ??= $"https://javplayer.cc/v/{safeId}";
+ break;
+
+ case "missav":
+ case "missav.ai":
+ siteDisplayName = "missav.ai";
+ badgeText = "MISSAV VIDEO";
+ accentGradient = "linear-gradient(135deg, #f43f5e 0%, #ec4899 50%, #a855f7 100%)";
+ accentPrimary = "#f43f5e";
+ glowColor = "rgba(244, 63, 94, 0.3)";
+ defaultOrigUrl = $"https://missav.ai/ja/{safeId}";
+ break;
+
+ case "spankbang":
+ default:
+ siteDisplayName = "SpankBang";
+ badgeText = "SPANKBANG VIDEO";
+ accentGradient = "linear-gradient(135deg, #ec4899 0%, #8b5cf6 100%)";
+ accentPrimary = "#ec4899";
+ glowColor = "rgba(236, 72, 153, 0.3)";
+ defaultOrigUrl = $"https://jp.spankbang.com/{safeId}/video/";
+ playerUrl ??= $"https://spankbang.com/{safeId}/embed/";
+ break;
+ }
+
+ var safeTitle = !string.IsNullOrWhiteSpace(title) ? Encoder.Encode(title) : $"{siteDisplayName} 動画プレイヤー ({safeId})";
+ var safeOriginalUrl = !string.IsNullOrWhiteSpace(originalUrl) ? Encoder.Encode(originalUrl) : defaultOrigUrl;
+ var safePlayerUrl = !string.IsNullOrWhiteSpace(playerUrl) ? Encoder.Encode(playerUrl) : "";
+ var safeStreamUrl = !string.IsNullOrWhiteSpace(streamUrl) ? Encoder.Encode(streamUrl) : "";
+
+ bool hasStream = !string.IsNullOrEmpty(safeStreamUrl);
+ bool hasPlayer = !string.IsNullOrEmpty(safePlayerUrl);
return $$"""
@@ -1642,20 +1752,20 @@ public static class HtmlRenderer
- SpankBang 動画プレイヤー (ID: {{safeId}}) - WebImageViewer
+ {{safeTitle}} - WebImageViewer
+