refine locale metadata and newsletter links

Author: dnywh

messages/de.json

@@ -117,6 +117,8 @@
   "Index": {
     "title": "Finde ein Zuhause für deine Küchenabfälle, wo auch immer du bist",
     "subtitle": "Peels verbindet die Menschen mit Lebensmittelkratzern mit denen, die komponieren. Es ist ein kostenloses und nicht-kommerzielles Gemeinschaftsprojekt.",
+    "metaDescription": "Peels verbindet Menschen mit Lebensmittelresten mit denjenigen, die kompostieren. Es ist ein kostenloses, nicht-kommerzielles Gemeinschaftsprojekt.",
+    "metaKeywords": "Lebensmittelabfall, Essensreste, Kompost, Kompost in meiner Nähe, Kompost-Abgabestelle, Abgabe von Lebensmittelresten",
     "hostAvatarAlt": "Der Avatar eines Peels-Gastgebers",
     "buttons": {
       "browseMap": "Karte durchsuchen",

messages/en.json

@@ -117,6 +117,8 @@
   "Index": {
     "title": "Find a home for your food scraps, wherever you are",
     "subtitle": "Peels connects folks with food scraps to those who compost. It’s a free, non-commercial, community project.",
+    "metaDescription": "Peels connects folks with food scraps to those who compost. It’s a free, non-commercial, community project.",
+    "metaKeywords": "food waste, food scraps, share waste, sharewaste, makesoil, compost near me, compost drop-off, food scrap drop-off",
     "hostAvatarAlt": "The avatar for a Peels host",
     "buttons": {
       "browseMap": "Browse the map",

messages/es.json

@@ -117,6 +117,8 @@
   "Index": {
     "title": "Encuentra un hogar para tus restos de comida, estés donde estés",
     "subtitle": "Peels conecta a personas con restos de comida con quienes hacen compost. Es un proyecto comunitario, gratuito y sin fines de lucro.",
+    "metaDescription": "Peels conecta a personas con restos de comida con quienes hacen compost. Es un proyecto comunitario, gratuito y sin fines de lucro.",
+    "metaKeywords": "desperdicio alimentario, restos de comida, compost, compost cerca de mí, punto de compostaje, entrega de restos de comida",
     "hostAvatarAlt": "El avatar de un anfitrión de Peels",
     "buttons": {
       "browseMap": "Explorar el mapa",

messages/fr.json

@@ -117,6 +117,8 @@
   "Index": {
     "title": "Trouvez une destination pour vos restes alimentaires, où que vous soyez",
     "subtitle": "Peels met en relation des personnes qui ont des restes alimentaires avec celles qui compostent. C’est un projet communautaire gratuit et non commercial.",
+    "metaDescription": "Peels met en relation des personnes qui ont des restes alimentaires avec celles qui compostent. C’est un projet communautaire gratuit et non commercial.",
+    "metaKeywords": "gaspillage alimentaire, restes alimentaires, compost, compost près de chez moi, point de dépôt compost, dépôt de restes alimentaires",
     "hostAvatarAlt": "L’avatar d’une personne hôte sur Peels",
     "buttons": {
       "browseMap": "Parcourir la carte",

messages/pt-BR.json

@@ -117,6 +117,8 @@
   "Index": {
     "title": "Encontre um destino para os seus restos de comida, esteja onde estiver",
     "subtitle": "O Peels liga pessoas com restos de comida a quem faz compostagem. É um projeto comunitário, gratuito e sem fins comerciais.",
+    "metaDescription": "O Peels liga pessoas com restos de comida a quem faz compostagem. É um projeto comunitário, gratuito e sem fins comerciais.",
+    "metaKeywords": "desperdício de alimentos, restos de comida, compostagem, compostagem perto de mim, ponto de entrega para compostagem, entrega de restos de comida",
     "hostAvatarAlt": "O avatar de uma pessoa anfitriã do Peels",
     "buttons": {
       "browseMap": "Explorar o mapa",

src/app/(core)/(interact)/(centered)/profile/page.js

@@ -42,9 +42,12 @@ export default async function ProfilePage() {
     supabase.from("profiles").select().eq("id", user.id).single(),
   ]);
 
+  const userMetadataPreferredLocale = user?.user_metadata?.preferred_locale;
   const preferredLocale =
     normaliseLocale(profile?.preferred_locale) ??
-    normaliseLocale(user?.user_metadata?.preferred_locale) ??
+    (typeof userMetadataPreferredLocale === "string"
+      ? normaliseLocale(userMetadataPreferredLocale)
+      : undefined) ??
     "en";
 
   return (

src/app/(core)/(static)/(index)/page.js

@@ -1,5 +1,6 @@
 import { Suspense } from "react";
 import { useTranslations } from "next-intl";
+import { getTranslations } from "next-intl/server";
 import Link from "next/link";
 import { siteConfig } from "@/config/site";
 import IntroHeader from "@/components/IntroHeader";
@@ -13,11 +14,30 @@ import HeaderBlock from "@/components/HeaderBlock";
 import FooterBlock from "@/components/FooterBlock";
 import { styled } from "@pigment-css/react";
 
-export const metadata = {
-  title: {
-    absolute: `${siteConfig.name}: ${siteConfig.description}`,
-  },
-};
+export async function generateMetadata() {
+  const t = await getTranslations("Index");
+  const description = t("metaDescription");
+  const keywords = t("metaKeywords")
+    .split(",")
+    .map((keyword) => keyword.trim())
+    .filter(Boolean);
+
+  return {
+    title: {
+      absolute: `${siteConfig.name}: ${t("title")}`,
+    },
+    description,
+    keywords,
+    openGraph: {
+      title: `${siteConfig.name}: ${t("title")}`,
+      description,
+    },
+    twitter: {
+      title: `${siteConfig.name}: ${t("title")}`,
+      description,
+    },
+  };
+}
 
 export default function Index() {
   const t = useTranslations("Index");

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

@@ -25,7 +25,7 @@ export async function GET(request: Request) {
   });
 
   newsletterIssues.forEach((issue) => {
-    const issueLink = `${siteConfig.url}/newsletter/${issue.slug}`;
+    const issueLink = `${siteConfig.url}/newsletter/${issue.slug}?locale=${locale}`;
     const issueImage = new URL(
       getNewsletterIssueImageUrl(
         issue.customMetadata.issueNumber,
@@ -35,7 +35,7 @@ export async function GET(request: Request) {
     ).toString();
     feed.addItem({
       title: issue.metadata.title,
-      link: `${siteConfig.url}/newsletter/${issue.slug}`,
+      link: issueLink,
       description: issue.metadata.description,
       author: issue.metadata.authors.map((author) => ({
         name: author,

src/utils/postgrest.ts

@@ -9,7 +9,7 @@ export function isMissingPostgrestColumn(
 ) {
   return (
     error.code === "PGRST204" &&
-    new RegExp(columnName, "i").test(error.message ?? "")
+    (error.message ?? "").toLowerCase().includes(columnName.toLowerCase())
   );
 }
 

supabase/functions/_shared/newsletter.ts

@@ -211,8 +211,17 @@ export const getNewsletterEmailSubject = (locale: SupportedLocale) => {
   return `${copy.subjectPrefix}: ${issue.title}`;
 };
 
-export const getNewsletterIssueUrl = () =>
-  `https://www.peels.app/newsletter/${currentIssue.slug}`;
+export const getNewsletterIssueUrl = (locale?: SupportedLocale) => {
+  const issueUrl = new URL(
+    `https://www.peels.app/newsletter/${currentIssue.slug}`
+  );
+
+  if (locale && locale !== defaultEmailLocale) {
+    issueUrl.searchParams.set("locale", locale);
+  }
+
+  return issueUrl.toString();
+};
 
 export const getNewsletterAudienceConfigs = (): Array<{
   locale: SupportedLocale;