Sort posts by date and order.

brixen · brixen · commit 069bb41ca1a9 · 2025-11-03T15:49:53.000-08:00
diff --git a/src/lib/dates.ts b/src/lib/dates.ts
@@ -1,28 +1,32 @@
+type D = Date | string;
+
 const fmtUTC = new Intl.DateTimeFormat(undefined, {
   year: 'numeric',
   month: 'short',
   day: 'numeric',
   timeZone: 'UTC',
 });
 
-const fmtLocal = new Intl.DateTimeFormat(undefined, {
-  year: 'numeric',
-  month: 'short',
-  day: 'numeric',
-});
-
-export function asDate(d: Date | string): Date {
+export function asDate(d: D): Date {
   return d instanceof Date ? d : new Date(d);
 }
 
-export function formatDateUTC(d: Date | string): string {
+export function formatDateUTC(d: D): string {
   return fmtUTC.format(asDate(d));
 }
 
-export function formatDateLocal(d: Date | string): string {
-  return fmtLocal.format(asDate(d));
+export function compareDatesDesc(a: D, b: D): number {
+  return asDate(b).getTime() - asDate(a).getTime();
 }
 
-export function compareDatesDesc(a: Date | string, b: Date | string): number {
-  return asDate(b).getTime() - asDate(a).getTime();
+// Sort by date (newest first), then by order (lower first).
+export function compareByDateThenOrder(
+  a: { date: D; order?: number },
+  b: { date: D; order?: number }
+): number {
+  const diff = compareDatesDesc(a.date, b.date);
+  if (diff !== 0) return diff;
+  const ao = (a.order ?? 0) | 0;
+  const bo = (b.order ?? 0) | 0;
+  return ao - bo; // lower order wins
 }
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
@@ -1,9 +1,9 @@
 ---
 import { getCollection } from 'astro:content';
-import { compareDatesDesc } from '@/lib/dates';
+import { compareByDateThenOrder } from '@/lib/dates';
 
 const posts = await getCollection('blog', ({ data }) => data.published !== false);
-const sorted = posts.sort((a, b) => compareDatesDesc(a.data.date, b.data.date));
+const sorted = posts.sort((a, b) => compareByDateThenOrder(a.data, b.data));
 ---
 
 <html lang="en">
@@ -12,10 +12,8 @@ const sorted = posts.sort((a, b) => compareDatesDesc(a.data.date, b.data.date));
     <h1>Blog</h1>
     <ul class="not-prose space-y-4">
       {sorted.map((post) => (
-        <li class="border-b border-slate-800 pb-4">
-          <a class="text-lg font-semibold hover:underline" href={`/blog/${post.slug}/`}>
-            {post.data.title}
-          </a>
+        <li>
+          <a href={`/blog/${post.slug}/`}>{post.data.title}</a>
         </li>
       ))}
     </ul>
