From e4052fc14514dd75e290a07f67852315bfadaed4 Mon Sep 17 00:00:00 2001 From: lew Date: Fri, 27 Mar 2026 19:11:57 +0000 Subject: [PATCH] refactor: renamed md to posts, and plaintext to files --- www/src/content.config.ts | 2 +- www/src/lib/consts.ts | 2 +- www/src/lib/{md.ts => posts.ts} | 2 +- www/src/pages/[slug].astro | 4 ++-- www/src/pages/feed.xml.ts | 4 ++-- www/src/pages/index.astro | 8 ++++---- www/src/pages/sitemap.txt.ts | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename www/src/lib/{md.ts => posts.ts} (94%) diff --git a/www/src/content.config.ts b/www/src/content.config.ts index 914dbec..6efc211 100644 --- a/www/src/content.config.ts +++ b/www/src/content.config.ts @@ -28,4 +28,4 @@ const bookmarks = defineCollection({ }) }); -export const collections = { md, bookmarks }; +export const collections = { posts, bookmarks }; diff --git a/www/src/lib/consts.ts b/www/src/lib/consts.ts index a19834c..a2e8d87 100644 --- a/www/src/lib/consts.ts +++ b/www/src/lib/consts.ts @@ -6,7 +6,7 @@ export const SUBDOMAINS = [ ]; export const SECTIONS = { - plaintext: 'plaintext', + files: 'files', bookmarks: 'bookmarks', guestbook: 'guestbook', } as const; diff --git a/www/src/lib/md.ts b/www/src/lib/posts.ts similarity index 94% rename from www/src/lib/md.ts rename to www/src/lib/posts.ts index 4c5cb5b..6b44477 100644 --- a/www/src/lib/md.ts +++ b/www/src/lib/posts.ts @@ -2,7 +2,7 @@ import type { CollectionEntry } from 'astro:content'; import { DEFAULT_CATEGORY } from './consts'; import { sortEntries } from './format'; -export type Post = CollectionEntry<'md'> & { body?: string }; +export type Post = CollectionEntry<'posts'> & { body?: string }; export function getSlug(postId: string): string { const parts = postId.split('/'); diff --git a/www/src/pages/[slug].astro b/www/src/pages/[slug].astro index 4f1c6a5..5f92dde 100644 --- a/www/src/pages/[slug].astro +++ b/www/src/pages/[slug].astro @@ -2,10 +2,10 @@ import { getCollection, render } from 'astro:content'; import Layout from '../layouts/Layout.astro'; import { formatDate, formatListItem, excerpt, wordCount } from '../lib/format'; -import { getSlug, resolveRelatedPosts, type Post } from '../lib/md'; +import { getSlug, resolveRelatedPosts, type Post } from '../lib/posts'; export async function getStaticPaths() { - const allPosts = await getCollection('md'); + const allPosts = await getCollection('posts'); return allPosts.map(post => ({ params: { slug: getSlug(post.id) }, props: { post, allPosts } diff --git a/www/src/pages/feed.xml.ts b/www/src/pages/feed.xml.ts index 417ebd6..1b26c9b 100644 --- a/www/src/pages/feed.xml.ts +++ b/www/src/pages/feed.xml.ts @@ -1,12 +1,12 @@ import rss from '@astrojs/rss'; import { getCollection } from 'astro:content'; import type { APIContext } from 'astro'; -import { getSlug, type Post } from '../lib/md'; +import { getSlug, type Post } from '../lib/posts'; import { getTxtFiles } from '../lib/txt'; import { excerpt } from '../lib/format'; export async function GET(context: APIContext) { - const posts = await getCollection('md'); + const posts = await getCollection('posts'); const txtFiles = getTxtFiles(); const items = [ diff --git a/www/src/pages/index.astro b/www/src/pages/index.astro index 59bf463..9f6f8ef 100644 --- a/www/src/pages/index.astro +++ b/www/src/pages/index.astro @@ -3,11 +3,11 @@ import { getCollection } from 'astro:content'; import Layout from '../layouts/Layout.astro'; import { getApprovedEntries, type GuestbookEntry } from '../lib/db'; import { formatDate, formatListItem, extractDomain, wordCount, escapeHtml } from '../lib/format'; -import { organizePostsByCategory, getSlug } from '../lib/md'; +import { organizePostsByCategory, getSlug } from '../lib/posts'; import { getTxtFiles } from '../lib/txt'; import { DEFAULT_CATEGORY, SECTIONS, SUBDOMAINS } from '../lib/consts'; -const posts = await getCollection('md'); +const posts = await getCollection('posts'); const { grouped, categories: sortedCategories } = organizePostsByCategory(posts); const bookmarksCollection = await getCollection('bookmarks'); @@ -43,8 +43,8 @@ const urls = [ ); })} -
- +
+
{ const name = f.name.replace(/\.txt$/, ''); return `${formatListItem(f.date, `/${f.name}`, name, { suffix: f.description })}`; diff --git a/www/src/pages/sitemap.txt.ts b/www/src/pages/sitemap.txt.ts index 2121a21..634b568 100644 --- a/www/src/pages/sitemap.txt.ts +++ b/www/src/pages/sitemap.txt.ts @@ -1,12 +1,12 @@ import { getCollection } from 'astro:content'; import type { APIContext } from 'astro'; -import { getSlug } from '../lib/md'; +import { getSlug } from '../lib/posts'; import { getTxtFiles } from '../lib/txt'; import { SUBDOMAINS } from '../lib/consts'; export async function GET(context: APIContext) { const site = context.site?.origin ?? 'https://wynne.rs'; - const posts = await getCollection('md'); + const posts = await getCollection('posts'); const txtFiles = getTxtFiles().map(f => f.name); const urls = [