From ef1ead31dccd05f4275405b843ff47fa28a5116d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 07 Sep 2023 04:31:01 +0000
Subject: [PATCH] fix: encodeuri for slugs in rss
---
quartz/plugins/emitters/contentIndex.ts | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/quartz/plugins/emitters/contentIndex.ts b/quartz/plugins/emitters/contentIndex.ts
index f4bf6db..1d0af6d 100644
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@@ -1,4 +1,5 @@
import { GlobalConfiguration } from "../../cfg"
+import { getDate } from "../../components/Date"
import { FilePath, FullSlug, SimpleSlug, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
import path from "path"
@@ -22,13 +23,13 @@
const defaultOptions: Options = {
enableSiteMap: true,
enableRSS: true,
- includeEmptyFiles: false,
+ includeEmptyFiles: true,
}
function generateSiteMap(cfg: GlobalConfiguration, idx: ContentIndex): string {
const base = cfg.baseUrl ?? ""
const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<url>
- <loc>https://${base}/${slug}</loc>
+ <loc>https://${base}/${encodeURIComponent(slug)}</loc>
<lastmod>${content.date?.toISOString()}</lastmod>
</url>`
const urls = Array.from(idx)
@@ -41,26 +42,26 @@
const base = cfg.baseUrl ?? ""
const root = `https://${base}`
- const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<items>
+ const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<item>
<title>${content.title}</title>
- <link>${root}/${slug}</link>
- <guid>${root}/${slug}</guid>
+ <link>${root}/${encodeURIComponent(slug)}</link>
+ <guid>${root}/${encodeURIComponent(slug)}</guid>
<description>${content.description}</description>
<pubDate>${content.date?.toUTCString()}</pubDate>
- </items>`
+ </item>`
const items = Array.from(idx)
.map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
.join("")
- return `<rss xmlns:atom="http://www.w3.org/2005/atom" version="2.0">
+ return `<?xml version="1.0" encoding="UTF-8" ?>
+<rss version="2.0">
<channel>
<title>${cfg.pageTitle}</title>
<link>${root}</link>
<description>Recent content on ${cfg.pageTitle}</description>
<generator>Quartz -- quartz.jzhao.xyz</generator>
- <atom:link href="${root}/index.xml" rel="self" type="application/rss+xml"/>
+ ${items}
</channel>
- ${items}
</rss>`
}
@@ -74,7 +75,7 @@
const linkIndex: ContentIndex = new Map()
for (const [_tree, file] of content) {
const slug = file.data.slug!
- const date = file.data.dates?.modified ?? new Date()
+ const date = getDate(ctx.cfg.configuration, file.data) ?? new Date()
if (opts?.includeEmptyFiles || (file.data.text && file.data.text !== "")) {
linkIndex.set(slug, {
title: file.data.frontmatter?.title!,
--
Gitblit v1.10.0