Compare commits

..
3 Commits
12 changed files with 45 additions and 244 deletions

No files matched your search

+1 -8
View File
@@ -2,14 +2,7 @@
FROM mcr.microsoft.com/dotnet/runtime:10.0 AS runtime FROM mcr.microsoft.com/dotnet/runtime:10.0 AS runtime
WORKDIR /app WORKDIR /app
# タイムゾーン設定 (JST) および必要なツールのインストール # 日本時間に設定 (ベースイメージに tzdata は組み込み済み)
RUN apt-get update && apt-get install -y --no-install-recommends \
tzdata \
ca-certificates \
curl \
&& rm -rf /var/lib/apt/lists/*
# 日本時間に設定
ENV TZ=Asia/Tokyo ENV TZ=Asia/Tokyo
# 発行済みバイナリをコンテナ内へ配置 # 発行済みバイナリをコンテナ内へ配置
+3 -5
View File
@@ -197,12 +197,10 @@ internal class aurahentai
// 5. 本文 HTML の生成 // 5. 本文 HTML の生成
var body = new StringBuilder(); var body = new StringBuilder();
// ギャラリー表示リンク if (!string.IsNullOrEmpty(linkHref))
var match = Regex.Match(linkHref, @"/gallery/([^/]+)", RegexOptions.IgnoreCase);
if (match.Success)
{ {
string galleryId = match.Groups[1].Value; // WebImageViewer統一リンク (https://udukipc-web.armonica-vps.work/?url=[ページURL])
string galleryUrl = $"https://udukipc-web.armonica-vps.work/aurahentai/{galleryId}/"; string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}";
body.Append($"<div>"); body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>"); body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>"); body.Append($"</div>");
@@ -315,12 +315,10 @@ internal static class e_hentai_common
var body = new StringBuilder(); 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 (!string.IsNullOrEmpty(gallery.Url))
if (match.Success)
{ {
string galleryId = match.Groups[1].Value; // WebImageViewer統一リンク (https://udukipc-web.armonica-vps.work/?url=[ページURL])
string token = match.Groups[2].Value; string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(gallery.Url)}";
string galleryUrl = $"https://udukipc-web.armonica-vps.work/ehentai/{galleryId}/{token}";
body.Append($"<div>"); body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>"); body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>"); body.Append($"</div>");
@@ -252,173 +252,23 @@ internal static class MovieEroterestVideoParser
} }
/// <summary> /// <summary>
/// WebImageViewer の再生リンクを生成します。 /// WebImageViewer の再生リンクを統一URL方式(https://udukipc-web.armonica-vps.work/?url=[ページURL])で生成します。
/// </summary> /// </summary>
private static void BuildViewerUrl(EroterestArticleInfo info) private static void BuildViewerUrl(EroterestArticleInfo info)
{ {
string baseViewer = MovieEroterestConfig.WebImageViewerBaseUrl.TrimEnd('/'); string baseViewer = MovieEroterestConfig.WebImageViewerBaseUrl.TrimEnd('/');
// 1. エロタレドーガで streamUrl (m3u8) が取得できた場合 // 統一URLパターン: https://udukipc-web.armonica-vps.work/?url=[各ページURL]
if (info.VideoSiteName == "doga" && !string.IsNullOrWhiteSpace(info.StreamUrl)) // 優先度: 実動画URL > エロタレスト記事URL > 中継ブログURL
{ string targetUrl = !string.IsNullOrWhiteSpace(info.ActualVideoUrl)
info.ViewerUrl = $"{baseViewer}/video?site=doga&id={Uri.EscapeDataString(info.VideoSiteId ?? "doga")}&stream={Uri.EscapeDataString(info.StreamUrl)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}"; ? info.ActualVideoUrl
return; : (!string.IsNullOrWhiteSpace(info.ArticlePageUrl)
} ? info.ArticlePageUrl
: (!string.IsNullOrWhiteSpace(info.DestinationBlogUrl)
? info.DestinationBlogUrl
: $"https://movie.eroterest.net/page/{info.ArticleId}/"));
// 2. SpankBang info.ViewerUrl = $"{baseViewer}/?url={Uri.EscapeDataString(targetUrl)}";
if (info.VideoSiteName == "spankbang" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
info.ViewerUrl = $"{baseViewer}/spankbang/{Uri.EscapeDataString(info.VideoSiteId)}";
return;
}
// 3. 123av
if (info.VideoSiteName == "123av" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
info.ViewerUrl = $"{baseViewer}/123av/{Uri.EscapeDataString(info.VideoSiteId)}";
return;
}
// 4. MissAV
if (info.VideoSiteName == "missav" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
info.ViewerUrl = $"{baseViewer}/missav/{Uri.EscapeDataString(info.VideoSiteId)}";
return;
}
// 5. 直接ストリーム (m3u8 / mp4)
if (!string.IsNullOrWhiteSpace(info.StreamUrl))
{
info.ViewerUrl = $"{baseViewer}/video?stream={Uri.EscapeDataString(info.StreamUrl)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// 6. 公式インライン埋め込みプレイヤー (embed iframe) に対応している動画サイト
if (info.VideoSiteName == "senzuri" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://senzuri.tube/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=senzuri&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
if ((info.VideoSiteName == "txxx" || info.VideoSiteName == "hclips" || info.VideoSiteName == "hdzog") && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var playHost = info.VideoSiteName == "hclips" ? "https://www.hclips.com" : (info.VideoSiteName == "hdzog" ? "https://www.hdzog.com" : "https://www.txxx.com");
var play = $"{playHost}/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site={info.VideoSiteName}&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
if (info.VideoSiteName == "upornia" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://upornia.com/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=upornia&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
if (info.VideoSiteName == "youjizz" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://www.youjizz.com/embed/{info.VideoSiteId}";
info.ViewerUrl = $"{baseViewer}/video?site=youjizz&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
if (info.VideoSiteName == "inporn" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://inporn.com/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=inporn&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
if (info.VideoSiteName == "bdsmx" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://bdsmx.tube/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=bdsmx&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// VJAV
if (info.VideoSiteName == "vjav" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://vjav.com/embed/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=vjav&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// FC2動画
if ((info.VideoSiteName == "fc2" || info.VideoSiteName == "fc2video") && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://video.fc2.com/a/embed/player/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=fc2&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// LAXD
if (info.VideoSiteName == "laxd" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://video.laxd.com/a/embed/player/{info.VideoSiteId}/";
info.ViewerUrl = $"{baseViewer}/video?site=laxd&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// XVIDEOS
if (info.VideoSiteName == "xvideos" && !string.IsNullOrWhiteSpace(info.VideoSiteId))
{
var play = $"https://www.xvideos.com/embedframe/{info.VideoSiteId}";
info.ViewerUrl = $"{baseViewer}/video?site=xvideos&id={Uri.EscapeDataString(info.VideoSiteId)}&play={Uri.EscapeDataString(play)}&url={Uri.EscapeDataString(info.ActualVideoUrl ?? "")}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// 7. 実動画URLが存在する場合 (上記以外の動画サイトまたは未知サイト)
if (!string.IsNullOrWhiteSpace(info.ActualVideoUrl))
{
// URLから既知の動画サイト判定を試行し、埋め込み可能な場合はplayパラメータを付与
string? fallbackPlay = null;
string? detectedSite = info.VideoSiteName;
string? detectedId = info.VideoSiteId;
if (info.ActualVideoUrl.Contains("vjav.com", StringComparison.OrdinalIgnoreCase))
{
detectedSite = "vjav";
detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"/videos/([0-9]+)").Groups[1].Value;
if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://vjav.com/embed/{detectedId}/";
}
else if (info.ActualVideoUrl.Contains("video.laxd.com", StringComparison.OrdinalIgnoreCase) || info.ActualVideoUrl.Contains("laxd.com", StringComparison.OrdinalIgnoreCase))
{
detectedSite = "laxd";
detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"laxd\.com/(?:content/|embed/)?([0-9a-zA-Z_\-]+)").Groups[1].Value;
if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://video.laxd.com/a/embed/player/{detectedId}/";
}
else if (info.ActualVideoUrl.Contains("fc2.com", StringComparison.OrdinalIgnoreCase))
{
detectedSite = "fc2";
detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"(?:article/|aid=|content/)([0-9a-zA-Z_\-]+)").Groups[1].Value;
if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://video.fc2.com/a/embed/player/{detectedId}/";
}
else if (info.ActualVideoUrl.Contains("xvideos.com", StringComparison.OrdinalIgnoreCase))
{
detectedSite = "xvideos";
detectedId ??= System.Text.RegularExpressions.Regex.Match(info.ActualVideoUrl, @"(?:video\.|video)([0-9]+)").Groups[1].Value;
if (!string.IsNullOrWhiteSpace(detectedId)) fallbackPlay = $"https://www.xvideos.com/embedframe/{detectedId}";
}
var siteParam = !string.IsNullOrWhiteSpace(detectedSite) ? $"&site={Uri.EscapeDataString(detectedSite)}" : "";
var idParam = !string.IsNullOrWhiteSpace(detectedId) ? $"&id={Uri.EscapeDataString(detectedId)}" : "";
var playParam = !string.IsNullOrWhiteSpace(fallbackPlay) ? $"&play={Uri.EscapeDataString(fallbackPlay)}" : "";
info.ViewerUrl = $"{baseViewer}/video?url={Uri.EscapeDataString(info.ActualVideoUrl)}{siteParam}{idParam}{playParam}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// 7. まとめブログURLが存在する場合
if (!string.IsNullOrWhiteSpace(info.DestinationBlogUrl))
{
info.ViewerUrl = $"{baseViewer}/video?url={Uri.EscapeDataString(info.DestinationBlogUrl)}&title={Uri.EscapeDataString(info.Title)}";
return;
}
// 8. フォールバック: movie.eroterest.net 記事ページ
info.ViewerUrl = $"{baseViewer}/video?site=eroterest&id={Uri.EscapeDataString(info.ArticleId)}&url={Uri.EscapeDataString(info.ArticlePageUrl)}&title={Uri.EscapeDataString(info.Title)}";
} }
/// <summary> /// <summary>
+3 -3
View File
@@ -150,9 +150,9 @@ internal static class hentaipaw
summaryHtml = prevEntry.SummaryHtml; summaryHtml = prevEntry.SummaryHtml;
// 既存キャッシュに WebImageViewer のリンクが含まれていない場合はリンクを自動補完 // 既存キャッシュに 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"; string viewerUrl = $"https://ja.hentaipaw.com/viewer?articleId={Uri.EscapeDataString(articleId)}&page=1";
// 上部案内ブロックに WebImageViewer リンクを挿入 // 上部案内ブロックに WebImageViewer リンクを挿入
@@ -316,7 +316,7 @@ internal static class hentaipaw
// 本文 HTML (Summary) の生成 // 本文 HTML (Summary) の生成
var body = new StringBuilder(); var body = new StringBuilder();
string viewerUrl = $"https://ja.hentaipaw.com/viewer?articleId={Uri.EscapeDataString(articleId)}&page=1"; 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 リンク & 公式ビュワーリンク & 外部リンク // 1. WebImageViewer リンク & 公式ビュワーリンク & 外部リンク
body.Append($@"<div style=""margin-bottom: 12px; padding: 10px 14px; background: rgba(59, 130, 246, 0.08); border-radius: 8px; border-left: 4px solid #3b82f6;"">"); body.Append($@"<div style=""margin-bottom: 12px; padding: 10px 14px; background: rgba(59, 130, 246, 0.08); border-radius: 8px; border-left: 4px solid #3b82f6;"">");
@@ -204,9 +204,10 @@ internal class index_japanese
// HTML構築 // HTML構築
var body = new StringBuilder(); 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($"<div>"); body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>"); body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>"); body.Append($"</div>");
+5 -16
View File
@@ -94,23 +94,12 @@ internal class mangalear
if (link != null) if (link != null)
{ {
// ギャラリー表示リンクの生成 // ギャラリー表示リンク (WebImageViewer統一URL方式: https://udukipc-web.armonica-vps.work/?url=[ページURL])
string? galleryId = null;
string? galleryUrl = null;
var linkStr = link.ToString(); var linkStr = link.ToString();
var idMatch = Regex.Match(linkStr, @"(?:mangalear\.blog)?/(?:[a-zA-Z0-9_-]+/)?(?<id>\d+)/?(?:\?.*)?$"); string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkStr)}";
if (!idMatch.Success) body.Append($"<div>");
{ body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
idMatch = Regex.Match(linkStr, @"[?&]p=(?<id>\d+)"); body.Append($"</div>");
}
if (idMatch.Success)
{
galleryId = idMatch.Groups["id"].Value;
galleryUrl = $"https://udukipc-web.armonica-vps.work/mangalear/{galleryId}/";
body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>");
}
// 記事詳細ページの HTML を取得 // 記事詳細ページの HTML を取得
var docContents = await CmnUtil.GetDocument(client, link.ToString()); var docContents = await CmnUtil.GetDocument(client, link.ToString());
+2 -8
View File
@@ -168,14 +168,8 @@ internal static class missav
LogManager.AddLog($"[警告] missav 詳細ページ取得失敗 ({linkHref}): {ex.Message}"); LogManager.AddLog($"[警告] missav 詳細ページ取得失敗 ({linkHref}): {ex.Message}");
} }
// 動画IDの抽出とWebImageViewerリンクの生成 // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL])
var videoIdMatch = Regex.Match(linkHref, @"/ja/([^/?#]+)", RegexOptions.IgnoreCase); string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}";
string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : linkHref.TrimEnd('/').Split('/').Last();
string viewerUrl = $"https://udukipc-web.armonica-vps.work/missav/{Uri.EscapeDataString(videoId)}";
if (!string.IsNullOrEmpty(streamUrl))
{
viewerUrl += $"?stream={Uri.EscapeDataString(streamUrl)}";
}
// 本文 HTML(Summary)の生成(123avと同様の構成) // 本文 HTML(Summary)の生成(123avと同様の構成)
var body = new StringBuilder(); var body = new StringBuilder();
+2 -8
View File
@@ -232,14 +232,8 @@ internal class missav123
LogManager.AddLog($"[警告] 123av 詳細ページ取得失敗 ({linkHref}): {ex.Message}"); LogManager.AddLog($"[警告] 123av 詳細ページ取得失敗 ({linkHref}): {ex.Message}");
} }
// 動画IDの抽出とWebImageViewerリンクの生成 // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL])
var videoIdMatch = Regex.Match(linkHref, @"/video/([^/?#]+)", RegexOptions.IgnoreCase); string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(linkHref)}";
string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : linkHref.TrimEnd('/').Split('/').Last();
string viewerUrl = $"https://udukipc-web.armonica-vps.work/123av/{Uri.EscapeDataString(videoId)}";
if (!string.IsNullOrEmpty(playerUrl))
{
viewerUrl += $"?play={Uri.EscapeDataString(playerUrl)}";
}
// 更新日時(サイト上の追加・更新日時)の算出 // 更新日時(サイト上の追加・更新日時)の算出
DateTimeOffset? updatedDate = null; DateTimeOffset? updatedDate = null;
+5 -10
View File
@@ -115,16 +115,11 @@ internal class momonga_fanzine
var body = new StringBuilder(); var body = new StringBuilder();
if (link != null) if (link != null)
{ {
// ギャラリー表示リンク // ギャラリー表示リンク (WebImageViewer統一URL方式)
var match = Regex.Match(link.ToString(), @"(mo\d+)", RegexOptions.IgnoreCase); string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(link.ToString())}";
if (match.Success) body.Append($"<div>");
{ body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
string moId = match.Groups[1].Value; body.Append($"</div>");
string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/";
body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>");
}
// ダウンロードリンク // ダウンロードリンク
string encoded = ToBase64Url(link.AbsoluteUri); string encoded = ToBase64Url(link.AbsoluteUri);
@@ -115,16 +115,11 @@ internal class momonga_magazine
var body = new StringBuilder(); var body = new StringBuilder();
if (link != null) if (link != null)
{ {
// ギャラリー表示リンク // ギャラリー表示リンク (WebImageViewer統一URL方式)
var match = Regex.Match(link.ToString(), @"(mo\d+)", RegexOptions.IgnoreCase); string galleryUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(link.ToString())}";
if (match.Success) body.Append($"<div>");
{ body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
string moId = match.Groups[1].Value; body.Append($"</div>");
string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/";
body.Append($"<div>");
body.Append($"<a href=\"{galleryUrl}\" target=\"_blank\" rel=\"noopener noreferrer\" referrerpolicy=\"no-referrer\">[Gallery]</a>");
body.Append($"</div>");
}
// ダウンロードリンク // ダウンロードリンク
string encoded = ToBase64Url(link.AbsoluteUri); string encoded = ToBase64Url(link.AbsoluteUri);
+2 -8
View File
@@ -109,14 +109,8 @@ internal static class spankbang
var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null; var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null;
var previewVideoUri = !string.IsNullOrEmpty(previewVideoSrc) ? new Uri(previewVideoSrc) : null; var previewVideoUri = !string.IsNullOrEmpty(previewVideoSrc) ? new Uri(previewVideoSrc) : null;
// 動画IDの抽出とWebImageViewerリンクの生成 // WebImageViewer統一リンクの生成 (https://udukipc-web.armonica-vps.work/?url=[ページURL])
var videoIdMatch = Regex.Match(fullUrl, @"spankbang\.(?:com|party)/([a-z0-9]+)(?:/video|/|$)", RegexOptions.IgnoreCase); string viewerUrl = $"https://udukipc-web.armonica-vps.work/?url={Uri.EscapeDataString(fullUrl)}";
if (!videoIdMatch.Success)
{
videoIdMatch = Regex.Match(rawHref, @"^/?([a-z0-9]+)/video", RegexOptions.IgnoreCase);
}
string videoId = videoIdMatch.Success ? videoIdMatch.Groups[1].Value : rawHref.TrimEnd('/').Split('/').Last();
string viewerUrl = $"https://udukipc-web.armonica-vps.work/spankbang/{Uri.EscapeDataString(videoId)}";
// RSS 本文 HTML (Summary) の構築 // RSS 本文 HTML (Summary) の構築
var body = new StringBuilder(); var body = new StringBuilder();