diff --git a/src/lib/components/DateWidget.svelte b/src/lib/components/DateWidget.svelte index 337868d..69ab90d 100644 --- a/src/lib/components/DateWidget.svelte +++ b/src/lib/components/DateWidget.svelte @@ -15,12 +15,12 @@
- + {dateString ? new Date(dateString).toLocaleString(undefined, { month: 'short', diff --git a/src/routes/blog/[slug]/+page.svelte b/src/routes/blog/[slug]/+page.svelte index 3c6f2b3..03115fc 100644 --- a/src/routes/blog/[slug]/+page.svelte +++ b/src/routes/blog/[slug]/+page.svelte @@ -36,16 +36,17 @@
{#if data.blogPost.dateChanged} {/if} {#each authors as author} - + + {author} diff --git a/src/routes/blog/rss.xml/+server.ts b/src/routes/blog/rss.xml/+server.ts index 69564c5..59429cf 100644 --- a/src/routes/blog/rss.xml/+server.ts +++ b/src/routes/blog/rss.xml/+server.ts @@ -21,6 +21,26 @@ function makeThumbnail(post: App.BlogPost): string { return `

`; } +function makeAuthors(post: App.BlogPost): string { + const authors = + (post.authors == null + ? [] + : typeof post.authors === 'string' + ? [post.authors] + : post.authors) + .map(a => escapeXml(a)); + + if (authors.length === 0) return ''; + + let authorsString = authors[0]; + if (authors.length > 1) { + const lastAuthor = authors.pop(); + authorsString = `${authors.join(', ')} и ${lastAuthor}`; + } + + return `\n${authorsString}`; +} + export async function GET({ setHeaders }) { setHeaders({ 'Cache-Control': 'max-age=0, s-maxage=3600', @@ -36,7 +56,7 @@ export async function GET({ setHeaders }) { ${feedUpdated.toUTCString()} ${posts.map((post) => ` ${escapeXml(post.title)} - +${makeAuthors(post)} https://teasanctuary.ru/blog/${post.slug} https://teasanctuary.ru/blog/${post.slug} ${(new Date(post.date!)).toUTCString()}