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($@"");
+ body.Append($@"");
}
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($"");
@@ -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($@"");
+ body.Append($@"");
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($"");
}
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($"");
}
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($"");
}
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($@"");
+ // 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($@"");
+ if (match.Success && long.TryParse(match.Groups[1].Value, out long snowflakeId))
+ {
+ try
+ {
+ // Twitter Snowflake ID (エポック: 1288834974657 ms = 2010-11-04 01:42:54.657 UTC)
+ long unixMs = (snowflakeId >> 22) + 1288834974657L;
+ var offset = DateTimeOffset.FromUnixTimeMilliseconds(unixMs).ToOffset(TimeSpan.FromHours(9));
+ publishedDate = offset.DateTime;
+ }
+ catch
+ {
+ publishedDate = DateTime.Now;
+ }
+ }
+
+ var body = new StringBuilder();
+ body.Append($@"");
+
+ body.Append($@"");
body.Append($@"");
- body.Append($@"動画を開く (.mp4)
");
+ body.Append($@"動画を開く (.mp4)
");
body.Append($@" ");
var item = new SyndicationItem(
@@ -75,8 +99,12 @@ internal class javtwi
string.Empty,
itemUri,
CmnUtil.CreateGuid(linkHref),
- DateTime.Now // 取得できた公開日時があればそれをセット
- );
+ publishedDate
+ )
+ {
+ PublishDate = publishedDate,
+ LastUpdatedTime = publishedDate
+ };
// item.Content = SyndicationContent.CreateHtmlContent(body.ToString());
// ※ RSS 2.0の場合は Content よりも Summary(タグ)が使われることが多いため、
// 両方に設定しておくか、Summary側にHTMLを設定すると大半のリーダーで確実です。
diff --git a/rss-generator/Class/RSS/kimochiinfo.cs b/rss-generator/Class/RSS/kimochiinfo.cs
index 478e63c..8ac58f1 100644
--- a/rss-generator/Class/RSS/kimochiinfo.cs
+++ b/rss-generator/Class/RSS/kimochiinfo.cs
@@ -94,8 +94,15 @@ internal class kimochiinfo
var body = new StringBuilder();
body.Append($@"バージョン:{versionText}
");
- body.Append($@"");
+ body.Append($@"");
body.Append($@"");
+
+ foreach (var a in divDetail.QuerySelectorAll("a"))
+ {
+ a.SetAttribute("target", "_blank");
+ a.SetAttribute("rel", "noopener noreferrer");
+ a.SetAttribute("referrerpolicy", "no-referrer");
+ }
body.Append(CmnUtil.GetHtmlWithoutJavaScript(divDetail));
var item = new SyndicationItem(
diff --git a/rss-generator/Class/RSS/mangalear.cs b/rss-generator/Class/RSS/mangalear.cs
index 51389c0..e5538ce 100644
--- a/rss-generator/Class/RSS/mangalear.cs
+++ b/rss-generator/Class/RSS/mangalear.cs
@@ -115,7 +115,7 @@ internal class mangalear
{
if (Uri.TryCreate(link, eyeCatchUrl, out var absoluteEyeCatchUri))
{
- body.Append($@"");
+ body.Append($@"");
}
}
@@ -165,7 +165,7 @@ internal class mangalear
var finalUrl = absoluteImgUri.ToString();
if (addedImages.Add(finalUrl))
{
- body.Append($@"");
+ body.Append($@"");
}
}
}
diff --git a/rss-generator/Class/RSS/missav.cs b/rss-generator/Class/RSS/missav.cs
index 39e789a..f39c5fe 100644
--- a/rss-generator/Class/RSS/missav.cs
+++ b/rss-generator/Class/RSS/missav.cs
@@ -74,7 +74,7 @@ internal static class missav
var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null;
var body = new StringBuilder();
- body.Append($@"");
+ body.Append($@"");
body.Append($@"");
var item = new SyndicationItem(
diff --git a/rss-generator/Class/RSS/missav123.cs b/rss-generator/Class/RSS/missav123.cs
index a7fb02c..abed79a 100644
--- a/rss-generator/Class/RSS/missav123.cs
+++ b/rss-generator/Class/RSS/missav123.cs
@@ -148,11 +148,11 @@ internal class missav123
body.Append($@"");
body.Append($@"");
body.Append($@"
");
- body.Append($@"");
+ body.Append($@"");
}
else
{
- body.Append($@"");
+ body.Append($@"");
}
// 3. サムネイル画像
diff --git a/rss-generator/Class/RSS/momonga_fanzine.cs b/rss-generator/Class/RSS/momonga_fanzine.cs
index d581400..fc8b1be 100644
--- a/rss-generator/Class/RSS/momonga_fanzine.cs
+++ b/rss-generator/Class/RSS/momonga_fanzine.cs
@@ -118,7 +118,7 @@ internal class momonga_fanzine
string moId = match.Groups[1].Value;
string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/";
body.Append($"");
}
@@ -126,7 +126,7 @@ internal class momonga_fanzine
string encoded = ToBase64Url(link.AbsoluteUri);
string downloadUrl = $"https://apicien.armonica-vps.work/fanzine/{encoded}";
body.Append($"");
// ギャラリーの1枚目画像
diff --git a/rss-generator/Class/RSS/momonga_magazine.cs b/rss-generator/Class/RSS/momonga_magazine.cs
index 1d26e55..1382698 100644
--- a/rss-generator/Class/RSS/momonga_magazine.cs
+++ b/rss-generator/Class/RSS/momonga_magazine.cs
@@ -118,7 +118,7 @@ internal class momonga_magazine
string moId = match.Groups[1].Value;
string galleryUrl = $"https://udukipc-web.armonica-vps.work/momonga/{moId}/";
body.Append($"");
}
@@ -126,7 +126,7 @@ internal class momonga_magazine
string encoded = ToBase64Url(link.AbsoluteUri);
string downloadUrl = $"https://apicien.armonica-vps.work/fanzine/{encoded}";
body.Append($"");
// ギャラリーの1枚目画像
diff --git a/rss-generator/Class/RSS/npb_6.cs b/rss-generator/Class/RSS/npb_6.cs
index f22ebf7..e3cf2b8 100644
--- a/rss-generator/Class/RSS/npb_6.cs
+++ b/rss-generator/Class/RSS/npb_6.cs
@@ -58,7 +58,7 @@ internal class npb_6
var imageUri = !string.IsNullOrEmpty(imageSrc) ? new Uri(imageSrc) : null;
var body = new StringBuilder();
- body.Append($@"");
+ body.Append($@"");
body.Append($@"");
var updateTime = DateTime.Now;