chore: myriad fixes + genre pages

src/pages/[permalink].astro

@@ -2,7 +2,6 @@
 import Layout from "@layouts/Layout.astro";
 import BlockRenderer from "@components/blocks/BlockRenderer.astro";
 import { fetchPages } from "@utils/data/pages.js";
-import { fetchGlobalData } from "@utils/data/global/index.js";
 
 export const prerender = true;
 
@@ -15,7 +14,6 @@ export async function getStaticPaths() {
 }
 
 const { page } = Astro.props;
-const { globals } = await fetchGlobalData(Astro);
 const currentUrl = Astro.url.pathname;
 ---
 

src/pages/books/index.astro

@@ -53,7 +53,7 @@ const bookYearLinks = (years) =>
       <article class="book-entry" key={book.url}>
         <a href={book.url}>
           <img
-            srcSet={`
+            srcset={`
             ${globals.cdn_url}${book.image}?class=verticalsm&type=webp 200w,
             ${globals.cdn_url}${book.image}?class=verticalmd&type=webp 400w
           `}

src/pages/books/years/[year].astro

@@ -7,7 +7,6 @@ import {
   findFavoriteBooks,
   mediaLinks,
 } from "@utils/helpers/media.js";
-import { fetchGlobalData } from "@utils/data/global/index.js";
 import { fetchBooks } from "@utils/data/books.js";
 import { DateTime } from "luxon";
 
@@ -21,7 +20,6 @@ export async function getStaticPaths() {
   }));
 }
 
-const { globals } = await fetchGlobalData(Astro);
 const books = await fetchBooks();
 const { year } = Astro.params;
 const yearData = books.years.find((y) => y.value === parseInt(year, 10));

src/pages/feeds/all.json.js

@@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchActivity } from "@utils/data/activity.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const activity = await fetchActivity();
@@ -15,11 +13,7 @@ export async function GET() {
     data: activity,
   });
 
-  const filePath = path.resolve("public/feeds/all.json");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, feed);
-
-  return new Response(feed, {
+    return new Response(feed, {
     status: 200,
     headers: {
       "Content-Type": "application/json",

src/pages/feeds/all.xml.js

@@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchActivity } from "@utils/data/activity.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const activity = await fetchActivity();
@@ -15,10 +13,6 @@ export async function GET() {
     data: activity,
   });
 
-  const filePath = path.resolve("public/feeds/all.xml");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, rss);
-
   return new Response(rss, {
     status: 200,
     headers: {

src/pages/feeds/books.json.js

@@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchBooks } from "@utils/data/books.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const books = await fetchBooks();
@@ -15,10 +13,6 @@ export async function GET() {
     data: books.feed,
   });
 
-  const filePath = path.resolve("public/feeds/books.json");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, feed);
-
   return new Response(feed, {
     status: 200,
     headers: {

src/pages/feeds/books.xml.js

@@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchBooks } from "@utils/data/books.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const books = await fetchBooks();
@@ -15,10 +13,6 @@ export async function GET() {
     data: books.feed,
   });
 
-  const filePath = path.resolve("public/feeds/books.xml");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, rss);
-
   return new Response(rss, {
     status: 200,
     headers: {

src/pages/feeds/links.json.js

@@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchLinks } from "@utils/data/links.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const links = await fetchLinks();
@@ -15,10 +13,6 @@ export async function GET() {
     data: links,
   });
 
-  const filePath = path.resolve("public/feeds/links.json");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, feed);
-
   return new Response(feed, {
     status: 200,
     headers: {

src/pages/feeds/links.xml.js

@@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchLinks } from "@utils/data/links";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const links = await fetchLinks();
@@ -15,10 +13,6 @@ export async function GET() {
     data: links,
   });
 
-  const filePath = path.resolve("public/feeds/links.xml");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, rss);
-
   return new Response(rss, {
     status: 200,
     headers: {

src/pages/feeds/movies.json.js

@@ -2,8 +2,6 @@ import { generateJsonFeed } from '@utils/generateJsonFeed.js';
 import { fetchGlobals } from '@utils/data/globals.js';
 import { fetchMovies } from '@utils/data/movies';
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const movies = await fetchMovies();
@@ -14,11 +12,6 @@ export async function GET() {
     globals,
     data: movies.feed,
   });
-
-  const filePath = path.resolve("public/feeds/movies.json");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, feed);
-
   return new Response(feed, {
     status: 200,
     headers: {

src/pages/feeds/movies.xml.js

@@ -2,23 +2,17 @@ import { generateRssFeed } from "@utils/generateRssFeed";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchMovies } from "@utils/data/movies.js";
 
-export const prerender = true;
-
-export async function getStaticPaths() {
+export async function GET() {
   const globals = await fetchGlobals();
   const movies = await fetchMovies();
 
-  const rss = GET({
+  const rss = generateRssFeed({
     permalink: "/feeds/movies.xml",
     title: "Movies feed",
     globals,
     data: movies.feed,
   });
 
-  const filePath = path.resolve("public/feeds/movies.xml");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, rss);
-
   return new Response(rss, {
     status: 200,
     headers: {

src/pages/feeds/posts.json.js

@@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchAllPosts } from "@utils/data/posts.js";
 
-export const prerender = true;
-
 export async function GET() {
   const globals = await fetchGlobals();
   const posts = await fetchAllPosts();
@@ -15,10 +13,6 @@ export async function GET() {
     data: posts,
   });
 
-  const filePath = path.resolve("public/feeds/posts.json");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, feed);
-
   return new Response(feed, {
     status: 200,
     headers: {

src/pages/feeds/posts.xml.js

@@ -2,23 +2,17 @@ import { generateRssFeed } from "@utils/generateRssFeed";
 import { fetchGlobals } from "@utils/data/globals.js";
 import { fetchAllPosts } from "@utils/data/posts.js";
 
-export const prerender = true;
-
-export async function getStaticPaths() {
+export async function GET() {
   const globals = await fetchGlobals();
   const posts = await fetchAllPosts();
 
-  const rss = GET({
+  const rss = generateRssFeed({
     permalink: "/feeds/posts.xml",
     title: "Posts feed",
     globals,
     data: posts,
   });
 
-  const filePath = path.resolve("public/feeds/posts.xml");
-  await fs.mkdir(path.dirname(filePath), { recursive: true });
-  await fs.writeFile(filePath, rss);
-
   return new Response(rss, {
     status: 200,
     headers: {

src/pages/feeds/syndication.xml.js

@@ -3,10 +3,7 @@ import fetchSyndication from '@utils/data/syndication.js';
 import { fetchGlobals } from '@utils/data/globals.js';
 import { dateToRFC822, encodeAmp, md } from '@utils/helpers/general.js';
 
-const generateSyndicationRSS = async () => {
-  const globals = await fetchGlobals();
-  const entries = await fetchSyndication();
-
+const generateSyndicationRSS = async (globals, entries) => {
   if (!entries.length) throw new Error('No feed entries found.');
 
   const title = globals.site_name || 'Syndicated Content Feed';
@@ -48,15 +45,17 @@ const generateSyndicationRSS = async () => {
 
 export async function GET() {
   try {
-    const rss = await generateSyndicationRSS();
+    const globals = await fetchGlobals();
+    const entries = await fetchSyndication();
+
+    const rss = await generateSyndicationRSS(globals, entries);
+
     return new Response(rss, {
       status: 200,
       headers: { 'Content-Type': 'application/rss+xml' },
     });
   } catch (error) {
-    console.error(error.message);
+    console.error('Error generating syndication feed:', error);
     return new Response('Error generating syndication feed.', { status: 500 });
   }
 }
-
-export const prerender = true;

src/pages/links.astro

@@ -3,11 +3,9 @@ import Layout from "@layouts/Layout.astro";
 import Paginator from "@components/nav/Paginator.astro";
 import RssBanner from "@components/blocks/banners/Rss.astro";
 import { fetchLinks } from "@utils/data/links.js";
-import { fetchGlobalData } from "@utils/data/global/index.js";
 
 export const prerender = true;
 
-const { globals } = await fetchGlobalData(Astro);
 const links = await fetchLinks();
 const title = "Links";
 const description =

src/pages/music/genres/[slug].astro

@@ -0,0 +1,71 @@
+---
+import Layout from "@layouts/Layout.astro";
+import AssociatedMedia from "@components/blocks/AssociatedMedia.astro";
+import { IconArrowLeft } from "@tabler/icons-react";
+import { fetchGenreByUrl } from "@utils/data/dynamic/genreByUrl.js";
+import { mediaLinks } from "@utils/helpers/media.js";
+import { md } from "@utils/helpers/general.js";
+
+const genre = await fetchGenreByUrl(Astro.url.pathname);
+if (!genre) return Astro.redirect("/404", 404);
+
+const artistCount = genre.artists?.length || 0;
+const connectingWords = artistCount > 1 ? "artists are" : "artist is";
+const genreMediaLinks = mediaLinks(genre.artists, "artist", 5);
+const pageTitle = `${genre.name} / Music`;
+const description = `Discover the music genre ${genre.name}, featuring ${artistCount} artists and ${genre.total_plays} total track plays.`;
+---
+
+<Layout
+  pageTitle={pageTitle}
+  description={description}
+  fullUrl={Astro.url.pathname}
+  schema="genre"
+>
+  <a class="back-link" href="/music" title="Go back to the music index page">
+    <IconArrowLeft size={18} /> Back to music
+  </a>
+  <h2>{genre.name}</h2>
+  <article class="genre-focus">
+    {
+      genreMediaLinks && (
+        <>
+          <p>
+            My top <strong class="highlight-text">{genre.name}</strong>{" "}
+            {connectingWords} <span set:html={genreMediaLinks}></span> I've listened to{" "}
+            <strong class="highlight-text">{genre.total_plays}</strong>{" "}
+            tracks from this genre.
+          </p>
+          <hr />
+        </>
+      )
+    }
+    <AssociatedMedia
+      books={genre.books}
+      movies={genre.movies}
+      posts={genre.posts}
+    />
+    {
+      genre.description && (
+        <>
+          <h3>Overview</h3>
+          <div data-toggle-content class="text-toggle-hidden">
+            <div set:html={md(genre.description)} />
+            <p>
+              <a href={genre.wiki_link}>Continue reading at Wikipedia.</a>
+            </p>
+            <p>
+              <em>
+                Wikipedia content provided under the terms of the{" "}
+                <a href="https://creativecommons.org/licenses/by-sa/3.0/">
+                  Creative Commons BY-SA license
+                </a>
+              </em>
+            </p>
+          </div>
+          <button data-toggle-button>Show more</button>
+        </>
+      )
+    }
+  </article>
+</Layout>

src/pages/posts/[...page].astro

@@ -1,8 +1,6 @@
 ---
-import { getCollection } from "astro:content";
 import { IconStar } from "@tabler/icons-react";
 import { fetchAllPosts } from "@data/posts.js";
-import { fetchGlobalData } from "@utils/data/global/index.js";
 import Layout from "@layouts/Layout.astro";
 import Paginator from "@components/nav/Paginator.astro";
 import { md } from "@utils/helpers/general.js";
@@ -10,13 +8,22 @@ import { DateTime } from "luxon";
 
 export const prerender = true;
 
-const posts = await fetchAllPosts();
-const { page } = Astro.props;
-const { globals } = await fetchGlobalData(Astro);
-const currentUrl = Astro.url.pathname;
+export async function getStaticPaths() {
+  const pageSize = 15; // Declare inside this function
+  const posts = await fetchAllPosts();
+
+  const totalPages = Math.ceil(posts.length / pageSize);
+  const paths = Array.from({ length: totalPages }, (_, i) => ({
+    params: { page: (i + 1).toString() },
+  }));
+
+  return paths;
+}
 
-const currentPage = Astro.params.page ? parseInt(Astro.params.page, 10) : 1;
 const pageSize = 15;
+const currentUrl = Astro.url.pathname;
+const currentPage = Astro.params.page ? parseInt(Astro.params.page, 10) : 1;
+const posts = await fetchAllPosts();
 const totalPosts = posts.length;
 const totalPages = Math.ceil(totalPosts / pageSize);
 const start = (currentPage - 1) * pageSize;