From 2512df13f75258dcff0baac2ce732b000ac4728d Mon Sep 17 00:00:00 2001 From: uduki Date: Thu, 1 Oct 2026 10:27:53 +0900 Subject: [PATCH] =?UTF-8?q?feat(gallery):=20WebImageViewer=E3=81=AE?= =?UTF-8?q?=E7=B5=B1=E4=B8=80URL=E5=BD=A2=E5=BC=8F(=3Furl=3D)=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=83=BB=E3=82=AE=E3=83=A3=E3=83=A9=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E7=B3=BBRSS=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rss-generator/Class/AuraHentai/aurahentai.cs | 8 +++---- .../Class/EHentai/e_hentai_common.cs | 8 +++---- rss-generator/Class/HentaiPaw/hentaipaw.cs | 6 +++--- .../Class/HitomiLa/index_japanese.cs | 5 +++-- rss-generator/Class/Mangalear/mangalear.cs | 21 +++++-------------- .../Class/Momonga/momonga_fanzine.cs | 15 +++++-------- .../Class/Momonga/momonga_magazine.cs | 15 +++++-------- 7 files changed, 27 insertions(+), 51 deletions(-) diff --git a/rss-generator/Class/AuraHentai/aurahentai.cs b/rss-generator/Class/AuraHentai/aurahentai.cs index bee3b77..ee17da1 100644 --- a/rss-generator/Class/AuraHentai/aurahentai.cs +++ b/rss-generator/Class/AuraHentai/aurahentai.cs @@ -197,12 +197,10 @@ internal class aurahentai // 5. 本文 HTML の生成 var body = new StringBuilder(); - // ギャラリー表示リンク - var match = Regex.Match(linkHref, @"/gallery/([^/]+)", RegexOptions.IgnoreCase); - if (match.Success) + if (!string.IsNullOrEmpty(linkHref)) { - string galleryId = match.Groups[1].Value; - string galleryUrl = $"https://udukipc-web.armonica-vps.work/aurahentai/{galleryId}/"; + // WebImageViewer統一リンク (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}"; body.Append($"
"); body.Append($"[Gallery]"); body.Append($"
"); diff --git a/rss-generator/Class/EHentai/e_hentai_common.cs b/rss-generator/Class/EHentai/e_hentai_common.cs index d57a425..323b56f 100644 --- a/rss-generator/Class/EHentai/e_hentai_common.cs +++ b/rss-generator/Class/EHentai/e_hentai_common.cs @@ -315,12 +315,10 @@ internal static class e_hentai_common var body = new StringBuilder(); // ギャラリー表示リンク - var match = System.Text.RegularExpressions.Regex.Match(gallery.Url, @"/g/(\d+)/([a-zA-Z0-9]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase); - if (match.Success) + if (!string.IsNullOrEmpty(gallery.Url)) { - string galleryId = match.Groups[1].Value; - string token = match.Groups[2].Value; - string galleryUrl = $"https://udukipc-web.armonica-vps.work/ehentai/{galleryId}/{token}"; + // WebImageViewer統一リンク (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(gallery.Url)}"; body.Append($"
"); body.Append($"[Gallery]"); body.Append($"
"); diff --git a/rss-generator/Class/HentaiPaw/hentaipaw.cs b/rss-generator/Class/HentaiPaw/hentaipaw.cs index a0b5778..81be479 100644 --- a/rss-generator/Class/HentaiPaw/hentaipaw.cs +++ b/rss-generator/Class/HentaiPaw/hentaipaw.cs @@ -150,9 +150,9 @@ internal static class hentaipaw summaryHtml = prevEntry.SummaryHtml; // 既存キャッシュに WebImageViewer のリンクが含まれていない場合はリンクを自動補完 - if (!summaryHtml.Contains("udukipc-web.armonica-vps.work/hentaipaw/")) + if (!summaryHtml.Contains("udukipc-web.armonica-vps.work/?url=")) { - string galleryUrl = $"https://udukipc-web.armonica-vps.work/hentaipaw/{Uri.EscapeDataString(articleId)}/"; + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString($"https://ja.hentaipaw.com/articles/{articleId}")}"; string viewerUrl = $"https://ja.hentaipaw.com/viewer?articleId={Uri.EscapeDataString(articleId)}&page=1"; // 上部案内ブロックに WebImageViewer リンクを挿入 @@ -316,7 +316,7 @@ internal static class hentaipaw // 本文 HTML (Summary) の生成 var body = new StringBuilder(); string viewerUrl = $"https://ja.hentaipaw.com/viewer?articleId={Uri.EscapeDataString(articleId)}&page=1"; - string galleryUrl = $"https://udukipc-web.armonica-vps.work/hentaipaw/{Uri.EscapeDataString(articleId)}/"; + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString($"https://ja.hentaipaw.com/articles/{articleId}")}"; // 1. WebImageViewer リンク & 公式ビュワーリンク & 外部リンク body.Append($@"
"); diff --git a/rss-generator/Class/HitomiLa/index_japanese.cs b/rss-generator/Class/HitomiLa/index_japanese.cs index fafec9b..fcf2597 100644 --- a/rss-generator/Class/HitomiLa/index_japanese.cs +++ b/rss-generator/Class/HitomiLa/index_japanese.cs @@ -204,9 +204,10 @@ internal class index_japanese // HTML構築 var body = new StringBuilder(); - if (!string.IsNullOrEmpty(galleryId)) + if (!string.IsNullOrEmpty(linkHref)) { - string galleryUrl = $"https://udukipc-web.armonica-vps.work/hitomi/{galleryId}"; + // WebImageViewer統一リンク (https://udukipc-web.armonica-vps.work/?url=[ページURL]) + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}"; body.Append($"
"); body.Append($"[Gallery]"); body.Append($"
"); diff --git a/rss-generator/Class/Mangalear/mangalear.cs b/rss-generator/Class/Mangalear/mangalear.cs index 4fc1835..4db3ce2 100644 --- a/rss-generator/Class/Mangalear/mangalear.cs +++ b/rss-generator/Class/Mangalear/mangalear.cs @@ -94,23 +94,12 @@ internal class mangalear if (link != null) { - // ギャラリー表示リンクの生成 - string? galleryId = null; - string? galleryUrl = null; + // ギャラリー表示リンク (WebImageViewer統一URL方式: https://udukipc-web.armonica-vps.work/?url=[ページURL]) var linkStr = link.ToString(); - var idMatch = Regex.Match(linkStr, @"(?:mangalear\.blog)?/(?:[a-zA-Z0-9_-]+/)?(?\d+)/?(?:\?.*)?$"); - if (!idMatch.Success) - { - idMatch = Regex.Match(linkStr, @"[?&]p=(?\d+)"); - } - if (idMatch.Success) - { - galleryId = idMatch.Groups["id"].Value; - galleryUrl = $"https://udukipc-web.armonica-vps.work/mangalear/{galleryId}/"; - body.Append($"
"); - body.Append($"[Gallery]"); - body.Append($"
"); - } + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkStr)}"; + body.Append($"
"); + body.Append($"[Gallery]"); + body.Append($"
"); // 記事詳細ページの HTML を取得 var docContents = await CmnUtil.GetDocument(client, link.ToString()); diff --git a/rss-generator/Class/Momonga/momonga_fanzine.cs b/rss-generator/Class/Momonga/momonga_fanzine.cs index ff19ff5..973aa8e 100644 --- a/rss-generator/Class/Momonga/momonga_fanzine.cs +++ b/rss-generator/Class/Momonga/momonga_fanzine.cs @@ -115,16 +115,11 @@ internal class momonga_fanzine var body = new StringBuilder(); if (link != null) { - // ギャラリー表示リンク - var match = Regex.Match(link.ToString(), @"(mo\d+)", RegexOptions.IgnoreCase); - if (match.Success) - { - string moId = match.Groups[1].Value; - string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/"; - body.Append($"
"); - body.Append($"[Gallery]"); - body.Append($"
"); - } + // ギャラリー表示リンク (WebImageViewer統一URL方式) + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(link.ToString())}"; + body.Append($"
"); + body.Append($"[Gallery]"); + body.Append($"
"); // ダウンロードリンク string encoded = ToBase64Url(link.AbsoluteUri); diff --git a/rss-generator/Class/Momonga/momonga_magazine.cs b/rss-generator/Class/Momonga/momonga_magazine.cs index 4b2ba38..f9cc72e 100644 --- a/rss-generator/Class/Momonga/momonga_magazine.cs +++ b/rss-generator/Class/Momonga/momonga_magazine.cs @@ -115,16 +115,11 @@ internal class momonga_magazine var body = new StringBuilder(); if (link != null) { - // ギャラリー表示リンク - var match = Regex.Match(link.ToString(), @"(mo\d+)", RegexOptions.IgnoreCase); - if (match.Success) - { - string moId = match.Groups[1].Value; - string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/"; - body.Append($"
"); - body.Append($"[Gallery]"); - body.Append($"
"); - } + // ギャラリー表示リンク (WebImageViewer統一URL方式) + string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(link.ToString())}"; + body.Append($"
"); + body.Append($"[Gallery]"); + body.Append($"
"); // ダウンロードリンク string encoded = ToBase64Url(link.AbsoluteUri);