From ad0fea8138c0e5790ff181dd34cbf341f6ff0fe7 Mon Sep 17 00:00:00 2001 From: uduki Date: Thu, 1 Oct 2026 11:37:17 +0900 Subject: [PATCH] =?UTF-8?q?fix(video):=20=E3=82=A8=E3=83=AD=E3=82=BF?= =?UTF-8?q?=E3=83=AC=E3=82=B9=E3=83=88=E3=83=BB=E3=81=BE=E3=81=A8=E3=82=81?= =?UTF-8?q?=E8=A8=98=E4=BA=8B=E3=81=8B=E3=82=89=E3=81=AETXXX=E7=AD=89?= =?UTF-8?q?=E3=81=AE=E5=8B=95=E7=94=BB=E8=87=AA=E5=8B=95=E6=A4=9C=E5=87=BA?= =?UTF-8?q?=E3=81=8A=E3=82=88=E3=81=B3=E5=BA=83=E5=91=8Aiframe=E8=AA=A4?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E9=98=B2=E6=AD=A2=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Unified/Services/VideoEmbedExtractor.cs | 83 +++++++++++++++++-- 1 file changed, 74 insertions(+), 9 deletions(-) diff --git a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs index 4553f51..b47a004 100644 --- a/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs +++ b/WebImageViewer/Class/Unified/Services/VideoEmbedExtractor.cs @@ -379,7 +379,7 @@ public class VideoEmbedExtractor string embedBase = host switch { "senzuri" => "https://senzuri.tube/embed/", - "txxx" => "https://www.txxx.com/embed/", + "txxx" => "https://txxx.com/embed/", "hclips" => "https://www.hclips.com/embed/", "hdzog" => "https://www.hdzog.com/embed/", "upornia" => "https://upornia.com/embed/", @@ -472,18 +472,53 @@ public class VideoEmbedExtractor candidateUrl = mf?.GetAttributeValue("href", "")?.Trim(); } - // 4. すべてのリンクから既知の動画ホストを探索 + // 4. すべてのリンクから動画ホスト(DomainClassifier判定および主要チューブサイト)を探索 if (string.IsNullOrWhiteSpace(candidateUrl)) { var allLinks = doc.DocumentNode.SelectNodes("//a[@href]"); if (allLinks != null) { - foreach (var a in allLinks) + // 画像(サムネイル)を含むリンクを最優先にソート(ブログ記事本文のアイキャッチ動画リンクを確実に拾う) + var prioritizedLinks = allLinks.OrderByDescending(a => a.SelectSingleNode(".//img") != null ? 1 : 0); + + foreach (var a in prioritizedLinks) { var href = a.GetAttributeValue("href", "")?.Trim(); - if (string.IsNullOrWhiteSpace(href)) continue; + if (string.IsNullOrWhiteSpace(href) || href.StartsWith("#") || href.StartsWith("javascript:", StringComparison.OrdinalIgnoreCase)) continue; - if (href.Contains("do-ga.eroterest.net/video/", StringComparison.OrdinalIgnoreCase) || + // 相対URLの場合は絶対URLへ補正 + if (href.StartsWith("//")) + { + href = "https:" + href; + } + else if (href.StartsWith("/") && Uri.TryCreate(pageUrl, UriKind.Absolute, out var baseUri)) + { + href = new Uri(baseUri, href).ToString(); + } + + // ドメイン分類による判定 + var classification = DomainClassifier.Classify(href); + if (classification.MediaType == MediaType.Video) + { + // まとめブログ自身やエロタレストのトップ・記事一覧リンク等は実動画ホストではないためスキップ + if (classification.SiteKey.Equals("blog", StringComparison.OrdinalIgnoreCase) || + classification.SiteKey.Equals("eroterest", StringComparison.OrdinalIgnoreCase)) + { + continue; + } + + candidateUrl = href; + break; + } + + // 既知の動画ホストパターン(フォールバック) + if (href.Contains("txxx.com/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("senzuri.tube/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("hclips.com/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("hdzog.com/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("upornia.com/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("youjizz.com/videos/", StringComparison.OrdinalIgnoreCase) || + href.Contains("do-ga.eroterest.net/video/", StringComparison.OrdinalIgnoreCase) || href.Contains("spankbang.com/", StringComparison.OrdinalIgnoreCase) || href.Contains("missav", StringComparison.OrdinalIgnoreCase) || href.Contains("123av.com/", StringComparison.OrdinalIgnoreCase) || @@ -511,6 +546,21 @@ public class VideoEmbedExtractor { subResult.Title = title ?? subResult.Title; } + + // ポスター画像が未設定の場合、記事からサムネイル画像を引き継ぐ + if (string.IsNullOrWhiteSpace(subResult.PosterUrl)) + { + var posterNode = doc.DocumentNode.SelectSingleNode("//meta[@property='og:image']/@content") + ?? doc.DocumentNode.SelectSingleNode("//div[contains(@class, 'pageDetail')]//img[@src]") + ?? doc.DocumentNode.SelectSingleNode("//img[contains(@class, 'img-thumbnail') or contains(@class, 'img-fluid')]"); + var poster = posterNode?.GetAttributeValue("content", "") ?? posterNode?.GetAttributeValue("src", ""); + if (!string.IsNullOrWhiteSpace(poster)) + { + if (poster.StartsWith("//")) poster = "https:" + poster; + subResult.PosterUrl = poster; + } + } + return subResult; } @@ -560,7 +610,7 @@ public class VideoEmbedExtractor item.PosterUrl = posterNode.GetAttributeValue("content", ""); } - // 1. <iframe src="..."> の探索(広告用iframeなどを除外) + // 1. <iframe src="..."> の探索(広告用・バナー用iframeなどを徹底除外) var iframeNodes = doc.DocumentNode.SelectNodes("//iframe[@src]"); if (iframeNodes != null) { @@ -569,9 +619,24 @@ public class VideoEmbedExtractor var src = ifr.GetAttributeValue("src", "")?.Trim(); if (string.IsNullOrWhiteSpace(src)) continue; - // 広告やトラッキング用の除外判定 - if (src.Contains("googletagmanager") || src.Contains("doubleclick") || - src.Contains("googleads") || src.Contains("okbp.xyz") || src.Contains("pic-stash")) + var lowerSrc = src.ToLowerInvariant(); + + // 広告、バナー、トラッキング用の除外判定 + if (lowerSrc.Contains("googletagmanager") || lowerSrc.Contains("doubleclick") || + lowerSrc.Contains("googleads") || lowerSrc.Contains("okbp.xyz") || lowerSrc.Contains("pic-stash") || + lowerSrc.Contains("dmm.co.jp") || lowerSrc.Contains("fanza") || lowerSrc.Contains("online-banner") || + lowerSrc.Contains("banner") || lowerSrc.Contains("yomeno.xyz") || lowerSrc.Contains("vstserv.com") || + lowerSrc.Contains("gggpppht.com") || lowerSrc.Contains("ad-stir") || lowerSrc.Contains("i-mobile") || + lowerSrc.Contains("trafficjunky") || lowerSrc.Contains("juicyads") || lowerSrc.Contains("exoclick") || + lowerSrc.Contains("popcash") || lowerSrc.Contains("syndication") || lowerSrc.Contains("mman.link") || + lowerSrc.Contains("fam-ad") || lowerSrc.Contains("adarea") || lowerSrc.Contains("kokarea")) + { + continue; + } + + // iframe属性(id, class)の広告キーワード判定 + var idClass = (ifr.GetAttributeValue("id", "") + " " + ifr.GetAttributeValue("class", "")).ToLowerInvariant(); + if (idClass.Contains("banner") || idClass.Contains("advert") || idClass.Contains("kokarea") || idClass.Contains("ad-")) { continue; }