enforce residential listing name null

Author: dnywh

src/components/ListingWrite/listingWriteController.ts

@@ -149,7 +149,7 @@ export function buildListingDraft({
     type: listingType,
     ...(listingType !== "residential" &&
       values.avatar && { avatar: values.avatar }),
-    ...(listingType !== "residential" && { name: validatedName }),
+    name: listingType === "residential" ? null : validatedName,
     description: values.description,
     location: `POINT(${values.coordinates.longitude} ${values.coordinates.latitude})`,
     area_name: values.areaName,

src/types/listing.ts

@@ -24,7 +24,7 @@ export type ListingDraftInput = {
   owner_id: string;
   type: ListingType;
   avatar?: string;
-  name?: string;
+  name?: string | null;
   description: string;
   location: string;
   area_name: string;

src/utils/listingSeo.ts

@@ -1,4 +1,5 @@
 import { getLocale, getTranslations } from "next-intl/server";
+import { cache } from "react";
 import type { ListingSeoCopy } from "./listingUtils.ts";
 
 function splitKeywordList(value: string) {
@@ -8,38 +9,40 @@ function splitKeywordList(value: string) {
     .filter(Boolean);
 }
 
-export async function getListingSeoOptions() {
-  const locale = await getLocale();
-  const t = await getTranslations({ locale, namespace: "Listings.seo" });
+export const getListingSeoOptions = cache(
+  async function getListingSeoOptions() {
+    const locale = await getLocale();
+    const t = await getTranslations({ locale, namespace: "Listings.seo" });
 
-  const seoCopy: ListingSeoCopy = {
-    privateHostName: t("privateHostName"),
-    fallbackListingName: t("fallbackListingName"),
-    residentialConnectName: t("residentialConnectName"),
-    residentialIntro: ({ name, location }) =>
-      location
-        ? t("residentialIntroWithLocation", { name, location })
-        : t("residentialIntro", { name }),
-    businessIntro: ({ name, location }) =>
-      location
-        ? t("businessIntroWithLocation", { name, location })
-        : t("businessIntro", { name }),
-    connect: ({ name, siteName }) =>
-      t("connect", { name, siteName, explainer: t("siteExplainer") }),
-    acceptedItemsLabel: t("acceptedItemsLabel"),
-    rejectedItemsLabel: t("rejectedItemsLabel"),
-    locationKeywords: ({ location }) => [
-      t("keywords.location", { location }),
-      t("keywords.foodScraps", { location }),
-      t("keywords.compost", { location }),
-      t("keywords.foodScrapDropOff", { location }),
-      t("keywords.compostDropOff", { location }),
-    ],
-    baseKeywords: () => splitKeywordList(t("keywords.base")),
-  };
+    const seoCopy: ListingSeoCopy = {
+      privateHostName: t("privateHostName"),
+      fallbackListingName: t("fallbackListingName"),
+      residentialConnectName: t("residentialConnectName"),
+      residentialIntro: ({ name, location }) =>
+        location
+          ? t("residentialIntroWithLocation", { name, location })
+          : t("residentialIntro", { name }),
+      businessIntro: ({ name, location }) =>
+        location
+          ? t("businessIntroWithLocation", { name, location })
+          : t("businessIntro", { name }),
+      connect: ({ name, siteName }) =>
+        t("connect", { name, siteName, explainer: t("siteExplainer") }),
+      acceptedItemsLabel: t("acceptedItemsLabel"),
+      rejectedItemsLabel: t("rejectedItemsLabel"),
+      locationKeywords: ({ location }) => [
+        t("keywords.location", { location }),
+        t("keywords.foodScraps", { location }),
+        t("keywords.compost", { location }),
+        t("keywords.foodScrapDropOff", { location }),
+        t("keywords.compostDropOff", { location }),
+      ],
+      baseKeywords: () => splitKeywordList(t("keywords.base")),
+    };
 
-  return {
-    locale,
-    seoCopy,
-  };
-}
+    return {
+      locale,
+      seoCopy,
+    };
+  }
+);

src/utils/listingUtils.test.ts

@@ -224,7 +224,7 @@ test("anonymous residential metadata emits an indexable teaser without private d
   const residentialListing = {
     ...communityListing,
     type: "residential",
-    name: "Sam's backyard bin",
+    name: null,
     description:
       "Sam's side gate is open after 5pm and the compost bin is beside the shed.",
     accepted_items: ["Banana peels for Sam's worms"],
@@ -252,11 +252,11 @@ test("anonymous residential metadata emits an indexable teaser without private d
   assert.doesNotMatch(description, /Sam|side gate|shed|Banana|Citrus/);
 });
 
-test("anonymous residential metadata avoids leaking listing names with localised SEO copy", () => {
+test("anonymous residential metadata avoids leaking profile names with localised SEO copy", () => {
   const residentialListing = {
     ...communityListing,
     type: "residential",
-    name: "Sam's backyard bin",
+    name: null,
     owner_first_name: "Sam",
     slug: "private-host",
   } satisfies Listing;
@@ -277,7 +277,6 @@ test("anonymous residential metadata avoids leaking listing names with localised
   );
   assert.match(description, /Contacta con esta persona en Peels/);
   assert.doesNotMatch(description, /Sam/);
-  assert.doesNotMatch(description, /backyard bin/);
 });
 
 test("anonymous unknown-type metadata emits a private teaser", () => {
@@ -319,7 +318,7 @@ test("authenticated residential metadata can use private display names", () => {
   const residentialListing = {
     ...communityListing,
     type: "residential",
-    name: "Sam's backyard bin",
+    name: null,
     owner_first_name: "Sam",
     slug: "private-host",
   } satisfies Listing;
@@ -337,15 +336,15 @@ test("authenticated residential metadata can use private display names", () => {
   );
   assert.match(String(metadata.description), /Connect with Sam on Peels/);
   assert.doesNotMatch(String(metadata.description), /helps people compost/);
-  assert.doesNotMatch(String(metadata.description), /Sam's backyard bin/);
+  assert.equal(residentialListing.name, null);
   assert.equal(metadata.robots, undefined);
 });
 
 test("anonymous residential avatars can use localised private-host alt text", () => {
   const residentialListing = {
     ...communityListing,
     type: "residential",
-    name: "Sam's backyard bin",
+    name: null,
     owner_first_name: "Sam",
     slug: "private-host",
   } satisfies Listing;
@@ -433,7 +432,7 @@ test("anonymous residential listing JSON-LD omits structured location details",
   const residentialListing = {
     ...communityListing,
     type: "residential",
-    name: "Sam's backyard bin",
+    name: null,
     description:
       "Sam's side gate is open after 5pm and the compost bin is beside the shed.",
     accepted_items: ["Banana peels for Sam's worms"],