summaryrefslogtreecommitdiff
path: root/src/pages
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages')
-rw-r--r--src/pages/index.astro2
-rw-r--r--src/pages/micro/[...page].astro14
-rw-r--r--src/pages/micro/[...slug].astro11
-rw-r--r--src/pages/micro/rss.xml.ts11
4 files changed, 13 insertions, 25 deletions
diff --git a/src/pages/index.astro b/src/pages/index.astro
index f3aac47..df7a66a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -16,7 +16,7 @@ const allPostsByDate = allPosts
// Micro
const MAX_MICRO = 5;
-const allMicro = await getCollection("note");
+const allMicro = await getCollection("micro").catch(() => []); // Fallback to empty array if micro collection fails
const latestMicro = allMicro.sort(collectionDateSort).slice(0, MAX_MICRO);
---
diff --git a/src/pages/micro/[...page].astro b/src/pages/micro/[...page].astro
index b4e3e07..edfecab 100644
--- a/src/pages/micro/[...page].astro
+++ b/src/pages/micro/[...page].astro
@@ -5,19 +5,15 @@ import { Icon } from "astro-icon/components";
import Note from "@/components/note/Note.astro";
import Pagination from "@/components/Paginator.astro";
import PageLayout from "@/layouts/Base.astro";
-import { collectionDateSort } from "@/utils/date";
export const getStaticPaths = (async ({ paginate }) => {
const MAX_MICRO_PER_PAGE = 10;
- // Get both local notes and Pleroma posts
- const [allNotes, allMicro] = await Promise.all([
- getCollection("note"),
- getCollection("micro").catch(() => []), // Fallback to empty array if micro collection fails
- ]);
+ // Get only Pleroma posts
+ const allMicro = await getCollection("micro").catch(() => []); // Fallback to empty array if micro collection fails
- // Combine and sort all micro posts
- const allMicroPosts = [...allNotes, ...allMicro].sort(
+ // Sort all micro posts
+ const allMicroPosts = allMicro.sort(
(a, b) => b.data.publishDate.getTime() - a.data.publishDate.getTime(),
);
@@ -25,7 +21,7 @@ export const getStaticPaths = (async ({ paginate }) => {
}) satisfies GetStaticPaths;
interface Props {
- page: Page<CollectionEntry<"note"> | CollectionEntry<"micro">>;
+ page: Page<CollectionEntry<"micro">>;
uniqueTags: string[];
}
diff --git a/src/pages/micro/[...slug].astro b/src/pages/micro/[...slug].astro
index 54f6234..4cfae32 100644
--- a/src/pages/micro/[...slug].astro
+++ b/src/pages/micro/[...slug].astro
@@ -6,15 +6,10 @@ import PageLayout from "@/layouts/Base.astro";
// if you're using an adaptor in SSR mode, getStaticPaths wont work -> https://docs.astro.build/en/guides/routing/#modifying-the-slug-example-for-ssr
export const getStaticPaths = (async () => {
- // Get both local notes and Pleroma posts
- const [allNotes, allMicro] = await Promise.all([
- getCollection("note"),
- getCollection("micro").catch(() => []), // Fallback to empty array if micro collection fails
- ]);
+ // Get only Pleroma posts
+ const allMicro = await getCollection("micro").catch(() => []); // Fallback to empty array if micro collection fails
- const allPosts = [...allNotes, ...allMicro];
-
- return allPosts.map((post) => ({
+ return allMicro.map((post) => ({
params: { slug: post.id },
props: { note: post }, // Keep 'note' name for compatibility with existing component
}));
diff --git a/src/pages/micro/rss.xml.ts b/src/pages/micro/rss.xml.ts
index 0827ccb..ce25129 100644
--- a/src/pages/micro/rss.xml.ts
+++ b/src/pages/micro/rss.xml.ts
@@ -3,14 +3,11 @@ import rss from "@astrojs/rss";
import { siteConfig } from "@/site.config";
export const GET = async () => {
- // Get both local notes and Pleroma posts
- const [allNotes, allMicro] = await Promise.all([
- getCollection("note"),
- getCollection("micro").catch(() => []), // Fallback to empty array if micro collection fails
- ]);
+ // Get only Pleroma posts
+ const allMicro = await getCollection("micro").catch(() => []); // Fallback to empty array if micro collection fails
- // Combine and sort all micro posts
- const allMicroPosts = [...allNotes, ...allMicro].sort(
+ // Sort all micro posts
+ const allMicroPosts = allMicro.sort(
(a, b) => b.data.publishDate.getTime() - a.data.publishDate.getTime(),
);