From 2e24cbe238970334e9cf6e9789bbd85419e91a30 Mon Sep 17 00:00:00 2001 From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com> Date: Sun, 19 Oct 2025 00:22:23 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=81=D1=81=D1=8B?= =?UTF-8?q?=D0=BB=D0=BA=D1=83=20=D0=BD=D0=B0=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B0,=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=80=D0=B0=D0=B7=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=20=D0=9A=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/blog/[slug]/+page.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/blog/[slug]/+page.svelte b/src/routes/blog/[slug]/+page.svelte index 3c6f2b3..3a0c014 100644 --- a/src/routes/blog/[slug]/+page.svelte +++ b/src/routes/blog/[slug]/+page.svelte @@ -45,7 +45,8 @@ {/if} {#each authors as author} - + + {author} From dcbd8a5980d3f25e68ee8158cf427b9035daf17b Mon Sep 17 00:00:00 2001 From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com> Date: Wed, 22 Oct 2025 05:45:22 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D1=80=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=8C=D0=B8=20=D0=B2=20RSS=20=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/blog/rss.xml/+server.ts | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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()} From ddd73c1412a7aa94be7c7cc4af69b9e89bf49386 Mon Sep 17 00:00:00 2001 From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com> Date: Wed, 22 Oct 2025 05:49:08 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/DateWidget.svelte | 4 ++-- src/routes/blog/[slug]/+page.svelte | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 3a0c014..03115fc 100644 --- a/src/routes/blog/[slug]/+page.svelte +++ b/src/routes/blog/[slug]/+page.svelte @@ -36,9 +36,9 @@
{#if data.blogPost.dateChanged}