From 0fe359cf178ddab760076fa8ee11d4cb4b8094ac Mon Sep 17 00:00:00 2001 From: uduki Date: Fri, 6 Nov 2026 22:44:37 +0900 Subject: [PATCH] =?UTF-8?q?fix(eroterest):=20=E6=9C=AC=E6=96=87=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=81=AE=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E6=95=B0?= =?UTF-8?q?=E3=83=BB=E7=9B=B8=E5=AF=BE=E8=A1=A8=E8=A8=98=E9=99=A4=E5=A4=96?= =?UTF-8?q?=E3=81=A8=E6=97=A2=E5=AD=98=E3=82=A8=E3=83=B3=E3=83=88=E3=83=AA?= =?UTF-8?q?=E5=84=AA=E5=85=88=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=AB=E3=82=88?= =?UTF-8?q?=E3=82=8B=E6=9C=AA=E8=AA=AD=E5=8C=96=E9=98=B2=E6=AD=A2=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Eroterest/MovieEroterestFeedManager.cs | 21 +++++++++++++++++-- .../Eroterest/MovieEroterestVideoParser.cs | 11 +++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/rss-generator/Class/Eroterest/MovieEroterestFeedManager.cs b/rss-generator/Class/Eroterest/MovieEroterestFeedManager.cs index e25e4a4..8ade60a 100644 --- a/rss-generator/Class/Eroterest/MovieEroterestFeedManager.cs +++ b/rss-generator/Class/Eroterest/MovieEroterestFeedManager.cs @@ -1,4 +1,4 @@ -using AngleSharp.Dom; +using AngleSharp.Dom; using rss_generator.Class.Common; using System; using System.Collections.Generic; @@ -351,6 +351,8 @@ internal static class MovieEroterestFeedManager /// /// 新着アイテムと既存アイテムをマージし、重複を排除して公開日時順にソートします。 + /// 既存アイテムが存在する場合は前回のPublishDateおよびSummaryHtmlを最優先で維持し、 + /// FreshRSSで更新されていない記事が未読化するのを防ぎます。 /// private static List MergeFeedItems( IEnumerable newItems, @@ -369,12 +371,27 @@ internal static class MovieEroterestFeedManager } } - // 2. 新着アイテムで上書き・追加(最新の詳細情報を優先) + // 2. 新着アイテムを追加(既存アイテムが存在する場合は公開日時および本文HTMLを固定) foreach (var item in newItems) { var key = GetItemKey(item); if (!string.IsNullOrWhiteSpace(key)) { + if (merged.TryGetValue(key, out var existing)) + { + if (existing.PublishDate != DateTimeOffset.MinValue) + { + item.PublishDate = existing.PublishDate; + } + if (existing.LastUpdatedTime != DateTimeOffset.MinValue) + { + item.LastUpdatedTime = existing.LastUpdatedTime; + } + if (existing.Summary != null && !string.IsNullOrWhiteSpace(existing.Summary.Text)) + { + item.Summary = new TextSyndicationContent(existing.Summary.Text, TextSyndicationContentKind.Html); + } + } merged[key] = item; } } diff --git a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs index 39c8da7..cf54492 100644 --- a/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs +++ b/rss-generator/Class/Eroterest/MovieEroterestVideoParser.cs @@ -1,4 +1,4 @@ -using AngleSharp.Dom; +using AngleSharp.Dom; using rss_generator.Class.Common; using rss_generator.Class.Eroterest.Core; using System; @@ -322,12 +322,11 @@ internal static class MovieEroterestVideoParser sb.Append(""); } - // 4. メタ情報リスト + // 4. メタ情報リスト(相対時間文字列や閲覧クリック数などの変動要素はハッシュ安定のため除外) sb.Append("
    "); if (info.ArticlePublishDate.HasValue) { - var relSuffix = !string.IsNullOrWhiteSpace(info.RelativeTimeText) ? $" ({WebUtility.HtmlEncode(info.RelativeTimeText)})" : ""; - sb.Append($"
  • 📅 記事公開日: {info.ArticlePublishDate.Value:yyyy/MM/dd HH:mm}{relSuffix}
  • "); + sb.Append($"
  • 📅 記事公開日: {info.ArticlePublishDate.Value:yyyy/MM/dd HH:mm}
  • "); } if (info.VideoPublishDate.HasValue) { @@ -341,10 +340,6 @@ internal static class MovieEroterestVideoParser { sb.Append($"
  • ⏱ 再生時間: {WebUtility.HtmlEncode(info.Duration)}
  • "); } - if (!string.IsNullOrWhiteSpace(info.ClickCount)) - { - sb.Append($"
  • 👁 人気度: {WebUtility.HtmlEncode(info.ClickCount)}
  • "); - } if (info.Actresses.Count > 0) { var actressLinks = string.Join(" / ", info.Actresses.Select(a => $"{WebUtility.HtmlEncode(a)}"));