From 46808590c60dc7ad39ba522e885ca35ab58bafa6 Mon Sep 17 00:00:00 2001 From: uduki Date: Sun, 6 Sep 2026 02:47:11 +0900 Subject: [PATCH] feat: add CmnUtil class and kimochi.info RSS feed generator service --- rss-generator/Class/CmnUtil.cs | 9 +++++++-- rss-generator/Class/RSS/kimochiinfo.cs | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rss-generator/Class/CmnUtil.cs b/rss-generator/Class/CmnUtil.cs index 4c33f59..b3b7e64 100644 --- a/rss-generator/Class/CmnUtil.cs +++ b/rss-generator/Class/CmnUtil.cs @@ -386,7 +386,12 @@ public class CmnUtil /// /// Feed を非同期でファイルに出力します。画像 Base64 変換が有効な場合は自動で変換を行います。 /// - public static async Task ExportXMLFileAsync(string fileName, SyndicationFeed feed, HttpClient? client = null, string addDir = "") + /// 出力先ファイル名 + /// SyndicationFeed + /// 画像ダウンロード用 HttpClient + /// サブディレクトリ + /// 画像を Base64 変換するかどうか(false の場合は通常の画像リンクを維持) + public static async Task ExportXMLFileAsync(string fileName, SyndicationFeed feed, HttpClient? client = null, string addDir = "", bool embedBase64 = true) { // 24時間以上前の古い記事を除外 if (feed.Items != null) @@ -395,7 +400,7 @@ public class CmnUtil } // 画像の Base64 埋め込み処理 - if (EmbedAllImagesBase64 && client != null) + if (embedBase64 && EmbedAllImagesBase64 && client != null) { try { diff --git a/rss-generator/Class/RSS/kimochiinfo.cs b/rss-generator/Class/RSS/kimochiinfo.cs index 5c9da17..af7def4 100644 --- a/rss-generator/Class/RSS/kimochiinfo.cs +++ b/rss-generator/Class/RSS/kimochiinfo.cs @@ -40,7 +40,7 @@ internal class kimochiinfo foreach (var linkElement in elements) { var imgElement = linkElement.QuerySelector("img"); - var imageSrc = (imgElement as IHtmlImageElement)!.Source; + var imageSrc = (imgElement as IHtmlImageElement)?.Source ?? imgElement?.GetAttribute("src"); var linkHref = linkElement.GetAttribute("href") ?? string.Empty; if (linkHref != string.Empty && !linkList.Contains(linkHref)) { @@ -103,6 +103,10 @@ internal class kimochiinfo a.SetAttribute("rel", "noopener noreferrer"); a.SetAttribute("referrerpolicy", "no-referrer"); } + foreach (var img in divDetail.QuerySelectorAll("img")) + { + img.SetAttribute("referrerpolicy", "no-referrer"); + } body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail)); var item = new SyndicationItem( @@ -122,7 +126,8 @@ internal class kimochiinfo } feed.Items = items; - await CmnUtil.ExportXMLFileAsync("kimochiinfo.xml", feed, client); + // kimochiinfo は画像リンクを Base64 変換せず、通常の画像リンクとして出力する + await CmnUtil.ExportXMLFileAsync("kimochiinfo.xml", feed, client, embedBase64: false); } catch (Exception ex) {