address Copilot review feedback

Author: dnywh

src/app/(core)/(static)/newsletter/feed.xml/route.ts

@@ -6,7 +6,7 @@ import { getNewsletterIssueImageUrl } from "@/utils/storage";
 import { defaultLocale, normaliseLocale } from "@/i18n/config";
 import { getTranslations } from "next-intl/server";
 
-export const dynamic = "force-dynamic";
+export const revalidate = 3600;
 
 export async function GET(request: Request) {
   const requestUrl = new URL(request.url);
@@ -51,6 +51,7 @@ export async function GET(request: Request) {
   return new Response(feed.rss2(), {
     headers: {
       "Content-Type": "application/rss+xml",
+      "Cache-Control": "public, s-maxage=3600, stale-while-revalidate=86400",
     },
   });
 }

src/app/actions.ts

@@ -16,21 +16,13 @@ import {
 } from "@/utils/utils";
 import { getUserLocale, setUserLocale } from "@/i18n/services/locale";
 import { resolveAuthLocale } from "@/utils/authRedirects";
+import { isMissingPreferredLocaleColumn } from "@/utils/postgrest";
 import { normaliseLocale } from "@/i18n/config";
 import { revalidatePath } from "next/cache";
 import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 
-function isMissingPreferredLocaleColumn(error: {
-  code?: string | null;
-  message?: string | null;
-}) {
-  return (
-    error.code === "PGRST204" && /preferred_locale/i.test(error.message ?? "")
-  );
-}
-
 function translateFirstNameFieldError(
   t: Awaited<ReturnType<typeof getTranslations>>,
   code?: FirstNameErrorCode

src/app/layout.tsx

@@ -1,5 +1,5 @@
 import { NextIntlClientProvider } from "next-intl";
-import { getLocale, getTranslations } from "next-intl/server";
+import { getLocale } from "next-intl/server";
 import { Metadata } from "next";
 import { siteConfig } from "@/config/site";
 import { getStaticFontUrl, usesHostedStaticAssets } from "@/utils/storage";
@@ -184,37 +184,31 @@ const Body = styled("body")(({ theme }) => ({
   backgroundColor: theme.colors.background.sunk,
 }));
 
-export async function generateMetadata(): Promise<Metadata> {
-  const locale = await getLocale();
-  const t = await getTranslations();
-  const description = t("Index.subtitle");
-
-  return {
-    metadataBase: new URL(siteConfig.url),
-    title: {
-      default: siteConfig.name,
-      template: `%s · ${siteConfig.name}`,
-    },
-    description,
-    keywords: [...siteConfig.meta.keywords],
-    openGraph: {
-      title: siteConfig.name,
-      type: "website",
-      description,
-      siteName: siteConfig.name,
+export const metadata: Metadata = {
+  metadataBase: new URL(siteConfig.url),
+  title: {
+    default: siteConfig.name,
+    template: `%s · ${siteConfig.name}`,
+  },
+  description: siteConfig.description,
+  keywords: [...siteConfig.meta.keywords],
+  openGraph: {
+    title: siteConfig.name,
+    type: "website",
+    description: siteConfig.description,
+    siteName: siteConfig.name,
+  },
+  alternates: {
+    types: {
+      "application/rss+xml": [
+        {
+          title: `${siteConfig.name}: Newsletter`,
+          url: `${siteConfig.url}/newsletter/feed.xml`,
+        },
+      ],
     },
-    alternates: {
-      types: {
-        "application/rss+xml": [
-          {
-            title: `${siteConfig.name}: ${t("Newsletter.title")}`,
-            url: `${siteConfig.url}/newsletter/feed.xml?locale=${locale}`,
-          },
-        ],
-      },
-    },
-  };
-}
+  },
+};
 
 export default async function RootLayout({
   children,

src/i18n/services/locale.ts

@@ -2,6 +2,7 @@
 
 import { cookies, headers } from "next/headers";
 import { createClient } from "@/utils/supabase/server";
+import { isMissingPreferredLocaleColumn } from "@/utils/postgrest";
 import {
   defaultLocale,
   type Locale,
@@ -11,15 +12,6 @@ import {
   parseAcceptLanguageHeader,
 } from "@/i18n/config";
 
-function isMissingPreferredLocaleColumn(error: {
-  code?: string | null;
-  message?: string | null;
-}) {
-  return (
-    error.code === "PGRST204" && /preferred_locale/i.test(error.message ?? "")
-  );
-}
-
 export async function getUserLocale() {
   const supabase = await createClient();
   const {

src/lib/content/handlers/newsletter.ts

@@ -39,7 +39,7 @@ export const getNewsletterIssueMetadata = cache(
           },
           resolvedLocale,
           "publishDate",
-          true // publishDate is required for legal pages
+          true // publishDate is required for newsletter issues
         );
       }
 

src/lib/content/utils.ts

@@ -1,7 +1,7 @@
 // Shared utils between all Markdown collections, like newsletter issues and legal pages
 // https://www.notion.so/peels/Markdown-Pages-20bb37e1678f806a9649c3c658ab6258?source=copy_link
 
-import { readdir } from "fs/promises";
+import { access, readdir } from "fs/promises";
 import type { Dirent } from "fs";
 import { join } from "path";
 import { defaultLocale, type Locale, normaliseLocale } from "@/i18n/config";
@@ -27,13 +27,31 @@ export function formatContentDate(dateString: string, locale: Locale) {
   }).format(new Date(dateString));
 }
 
+async function doesContentFileExist(contentPath: string) {
+  try {
+    await access(contentPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function importLocalizedContentModule(
   contentType: "newsletter" | "legal",
   slug: string,
   locale: Locale
 ) {
   if (locale !== defaultLocale) {
-    try {
+    const localisedContentPath = join(
+      process.cwd(),
+      "src",
+      "content",
+      contentType,
+      locale,
+      `${slug}.mdx`
+    );
+
+    if (await doesContentFileExist(localisedContentPath)) {
       const file = await import(
         `@/content/${contentType}/${locale}/${slug}.mdx`
       );
@@ -42,8 +60,6 @@ export async function importLocalizedContentModule(
         locale,
         isFallback: false,
       };
-    } catch (_error) {
-      // Fall through to the default English content.
     }
   }
 

src/utils/postgrest.ts

@@ -0,0 +1,18 @@
+type PostgrestLikeError = {
+  code?: string | null;
+  message?: string | null;
+};
+
+export function isMissingPostgrestColumn(
+  error: PostgrestLikeError,
+  columnName: string
+) {
+  return (
+    error.code === "PGRST204" &&
+    new RegExp(columnName, "i").test(error.message ?? "")
+  );
+}
+
+export function isMissingPreferredLocaleColumn(error: PostgrestLikeError) {
+  return isMissingPostgrestColumn(error, "preferred_locale");
+}