diff --git a/rss-generator/Class/RSS/Danbooru/rank.cs b/rss-generator/Class/RSS/Danbooru/rank.cs index 8d2c1e7..762cc58 100644 --- a/rss-generator/Class/RSS/Danbooru/rank.cs +++ b/rss-generator/Class/RSS/Danbooru/rank.cs @@ -272,7 +272,7 @@ internal class rank // 画像の配置 if (!string.IsNullOrEmpty(imageUrl)) { - body.Append($@"
"); + body.Append($@"
"); } // 画像のすぐ下に作者コメントを追加 @@ -300,7 +300,7 @@ internal class rank if (!string.IsNullOrEmpty(sourceUrl)) { - body.Append($@"
元ソース: {WebUtility.HtmlEncode(sourceUrl)}
"); + body.Append($@"
元ソース: {WebUtility.HtmlEncode(sourceUrl)}
"); } if (generalTags.Count > 0) diff --git a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs b/rss-generator/Class/RSS/Pixiv/pixiv_common.cs index 1617e88..a6c48f2 100644 --- a/rss-generator/Class/RSS/Pixiv/pixiv_common.cs +++ b/rss-generator/Class/RSS/Pixiv/pixiv_common.cs @@ -385,7 +385,7 @@ internal static class pixiv_common if (!string.IsNullOrWhiteSpace(displayImageUrl)) { body.Append($"
"); - body.Append($""); + body.Append($""); body.Append($"\"{WebUtility.HtmlEncode(illust.Title)}\""); body.Append($""); body.Append($"
"); @@ -393,7 +393,7 @@ internal static class pixiv_common // 作者・作品メタ情報 body.Append($"

"); - body.Append($"作者: {WebUtility.HtmlEncode(illust.UserName)}"); + body.Append($"作者: {WebUtility.HtmlEncode(illust.UserName)}"); if (illust.PageCount > 1) { body.Append($" | ページ数: {illust.PageCount}P"); diff --git a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs b/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs index 084ea79..1a4b097 100644 --- a/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs +++ b/rss-generator/Class/RSS/YouTube/YouTubeFeedManager.cs @@ -395,10 +395,10 @@ public static class YouTubeFeedManager if (!string.IsNullOrWhiteSpace(video.ThumbnailUrl)) { - body.Append($@"

"); + body.Append($@"
"); } - body.Append($@"
タイトル: {WebUtility.HtmlEncode(video.Title)}
"); + body.Append($@"
タイトル: {WebUtility.HtmlEncode(video.Title)}
"); body.Append($@"
チャンネル: {WebUtility.HtmlEncode(video.ChannelTitle)}
"); if (!string.IsNullOrWhiteSpace(video.PublishedText)) diff --git a/rss-generator/Class/RSS/aurahentai.cs b/rss-generator/Class/RSS/aurahentai.cs index bb17214..b02151d 100644 --- a/rss-generator/Class/RSS/aurahentai.cs +++ b/rss-generator/Class/RSS/aurahentai.cs @@ -203,7 +203,7 @@ internal class aurahentai string galleryId = match.Groups[1].Value; string galleryUrl = $"https://udukipc-web.armonica-vps.work/aurahentai/{galleryId}/"; body.Append($"
"); - body.Append($"[Gallery]"); + body.Append($"[Gallery]"); body.Append($"
"); } diff --git a/rss-generator/Class/RSS/ci_en.cs b/rss-generator/Class/RSS/ci_en.cs index b6f981f..599d22c 100644 --- a/rss-generator/Class/RSS/ci_en.cs +++ b/rss-generator/Class/RSS/ci_en.cs @@ -96,7 +96,7 @@ internal class ci_en if (!string.IsNullOrEmpty(targetImgSrc)) { var linkUrl = !string.IsNullOrEmpty(rawSrc) ? rawSrc : targetImgSrc; - var imgTagHtml = $@""; + var imgTagHtml = $@""; var fragment = parser.ParseDocument(imgTagHtml); var newElement = fragment.Body?.FirstElementChild; @@ -135,6 +135,15 @@ internal class ci_en img.SetAttribute("style", "max-width: 100%; height: auto;"); } + // 本文内リンクへのリファラー設定 + var regularAnchors = divDetail.QuerySelectorAll("a").ToList(); + foreach (var a in regularAnchors) + { + a.SetAttribute("target", "_blank"); + a.SetAttribute("rel", "noopener noreferrer"); + a.SetAttribute("referrerpolicy", "no-referrer"); + } + // 4. カバー画像/アイキャッチ画像の配置 string? coverImageUrl = null; if (elemArticle.QuerySelector("img.image, img") is IHtmlImageElement coverElem && !string.IsNullOrEmpty(coverElem.Source) && !coverElem.Source.Contains("no_image") && !coverElem.Source.Contains("logo_")) @@ -152,7 +161,7 @@ internal class ci_en if (!string.IsNullOrEmpty(coverImageUrl)) { - body.Append($@"
"); + body.Append($@"
"); } body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail)); diff --git a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs b/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs index 6465421..dd25671 100644 --- a/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs +++ b/rss-generator/Class/RSS/e_hentai/e_hentai_common.cs @@ -321,7 +321,7 @@ internal static class e_hentai_common string token = match.Groups[2].Value; string galleryUrl = $"https://udukipc-web.armonica-vps.work/ehentai/{galleryId}/{token}"; body.Append($"
"); - body.Append($"[Gallery]"); + body.Append($"[Gallery]"); body.Append($"
"); } diff --git a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs index d255e31..278a8ef 100644 --- a/rss-generator/Class/RSS/hitomi_la/index_japanese.cs +++ b/rss-generator/Class/RSS/hitomi_la/index_japanese.cs @@ -192,7 +192,7 @@ internal class index_japanese { string galleryUrl = $"https://udukipc-web.armonica-vps.work/hitomi/{galleryId}"; body.Append($"
"); - body.Append($"[Gallery]"); + body.Append($"[Gallery]"); body.Append($"
"); } if (!string.IsNullOrEmpty(imgSrc)) diff --git a/rss-generator/Class/RSS/javtwi.cs b/rss-generator/Class/RSS/javtwi.cs index 1882fa7..be884ab 100644 --- a/rss-generator/Class/RSS/javtwi.cs +++ b/rss-generator/Class/RSS/javtwi.cs @@ -1,9 +1,10 @@ -using AngleSharp.Dom; +using AngleSharp.Dom; using AngleSharp.Html.Dom; using System; using System.Collections.Generic; using System.ServiceModel.Syndication; using System.Text; +using System.Text.RegularExpressions; namespace rss_generator.Class.RSS; @@ -62,12 +63,35 @@ internal class javtwi var title = CmnUtil.GetLastPathPart(linkHref); - var body = new StringBuilder(); - body.Append($@"
{title}
"); + // Twitter Snowflake ID から正確な投稿日時(JST)を逆算 + DateTime publishedDate = DateTime.Now; + var match = Regex.Match(linkHref, @"/(\d{17,20})/"); + if (!match.Success && !string.IsNullOrEmpty(imageSrc)) + { + match = Regex.Match(imageSrc, @"/(\d{17,20})/"); + } - body.Append($@"