From 90f14bc652ef3d27f1d40739be330fff55e33d4c Mon Sep 17 00:00:00 2001 From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com> Date: Tue, 30 Sep 2025 06:02:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=D1=81=D1=82=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5=20=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/util/Blogs.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/lib/util/Blogs.ts b/src/lib/util/Blogs.ts index ad2d430..a45ceaa 100644 --- a/src/lib/util/Blogs.ts +++ b/src/lib/util/Blogs.ts @@ -2,15 +2,27 @@ import path from 'path'; export const THUMBNAIL_DEFAULT = "https://teasanctuary.ru/common/background-day.webp"; -export async function fetchPostsSorted() { +export type PostComparer = (a: App.BlogPost, b: App.BlogPost) => number; + +export const sortPostsByPostDate: PostComparer = (a, b) => new Date(b.date!).valueOf() - new Date(a.date!).valueOf(); + +function laterDate(a: string, b?: string): number { + const dateA = new Date(a).valueOf(); + if (!b) return dateA; + + const dateB = new Date(b).valueOf(); + return Math.max(dateA, dateB); +} + +export const sortPostsByPostAndUpdateDate: PostComparer = (a, b) => laterDate(b.date!, b.dateChanged) - laterDate(a.date!, a.dateChanged); + +export async function fetchPostsSorted(postComparer?: PostComparer) { const allPosts = await fetchPosts(); const sortedPosts = allPosts // Для списка постов оставляем только те, у которых объявлена дата публикации .filter((a) => !!a.date) - .sort((a, b) => { - return new Date(b.date!).valueOf() - new Date(a.date!).valueOf(); - }); + .sort(postComparer ?? sortPostsByPostDate); return sortedPosts; };