harden supabase read models

Author: dnywh

src/app/(core)/(interact)/(centered)/listings/[slug]/page.tsx

@@ -43,7 +43,7 @@ const getListingData = cache(async (slug: string) => {
     data: { user },
   } = await supabase.auth.getUser();
   const { data: listing } = await supabase
-    .from(user ? "listings_private_data" : "listings_public_data")
+    .from(user ? "listing_contact_cards" : "public_listings")
     .select()
     .match({ slug })
     .single();

src/app/(core)/(interact)/(stretched)/map/page.tsx

@@ -29,7 +29,7 @@ const getInitialData = cache(async (listingSlug: string | undefined) => {
 
   const listingResponse = listingSlug
     ? await supabase
-        .from(user ? "listings_private_data" : "listings_public_data")
+        .from(user ? "listing_contact_cards" : "public_listings")
         .select()
         .eq("slug", listingSlug)
         .single()

src/app/(forms)/profile/listings/[slug]/page.tsx

@@ -41,7 +41,7 @@ export default async function EditListingPage({
       .eq("id", user.id)
       .single(),
     supabase
-      .from("listings_private_data")
+      .from("listing_contact_cards")
       .select(
         `
           id,

src/app/(photo)/listings/[slug]/photos/[...photoPath]/page.tsx

@@ -25,7 +25,7 @@ const getListingData = cache(async (slug: string) => {
   const {
     data: { user },
   } = await supabase.auth.getUser();
-  const tableName = user ? "listings_private_data" : "listings_public_data";
+  const tableName = user ? "listing_contact_cards" : "public_listings";
   const selectColumns = user
     ? "name, owner_first_name, photos, type"
     : "name, photos, type";

src/app/actions.ts

@@ -188,25 +188,6 @@ export const signUpAction = async (formData: FormData, request?: Request) => {
     }
   }
 
-  // Check if user exists in auth.users
-  const { data: existingAuthUser, error: authError } = await supabase.rpc(
-    "check_if_email_exists",
-    {
-      email_to_check: email,
-    }
-  );
-
-  if (authError) {
-    console.error("Error checking email:", authError);
-    redirectUrl.searchParams.append("error", t("genericLater"));
-    return redirect(redirectUrl.toString());
-  }
-
-  if (existingAuthUser) {
-    redirectUrl.searchParams.append("error", t("accountExists"));
-    return redirect(redirectUrl.toString());
-  }
-
   const {
     data: { user },
     error,
@@ -243,6 +224,20 @@ export const signUpAction = async (formData: FormData, request?: Request) => {
       redirectUrl.searchParams.append("error", t("generic"));
       return redirect(redirectUrl.toString());
     }
+
+    const accountExistsPatterns = [
+      "already registered",
+      "already exists",
+      "User already registered",
+    ];
+    const accountExists = accountExistsPatterns.some((pattern) =>
+      error?.message?.toLowerCase().includes(pattern.toLowerCase())
+    );
+    if (accountExists) {
+      redirectUrl.searchParams.append("error", t("accountExists"));
+      return redirect(redirectUrl.toString());
+    }
+
     // Back to general error catching
     console.error(
       error?.code + " " + error?.message || "No user returned from sign up"

src/app/sitemap.ts

@@ -11,7 +11,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const supabase = await createClient();
 
   const { data: listings } = await supabase
-    .from("listings_public_data")
+    .from("public_listings")
     .select("slug, created_at")
     .in("type", ["community", "business"]);
 

src/components/ChatWindow/chatWindowController.ts

@@ -13,15 +13,9 @@ export function getThreadMessages(
   existingThread?: {
     messages?: ChatMessageRecord[] | null;
     chat_messages?: ChatMessageRecord[] | null;
-    chat_messages_with_senders?: ChatMessageRecord[] | null;
   } | null
 ) {
-  return (
-    existingThread?.messages ??
-    existingThread?.chat_messages_with_senders ??
-    existingThread?.chat_messages ??
-    []
-  );
+  return existingThread?.messages ?? existingThread?.chat_messages ?? [];
 }
 
 export async function loadThreadMessages({
@@ -32,8 +26,8 @@ export async function loadThreadMessages({
   threadId: string;
 }): Promise<InlineActionResult<ChatMessageRecord[]>> {
   const { data, error } = await supabase
-    .from("chat_messages_with_senders")
-    .select()
+    .from("chat_messages")
+    .select("id, content, created_at, read_at, sender_id, thread_id")
     .eq("thread_id", threadId)
     .order("created_at", { ascending: true });
 

src/components/ListingRead/ListingRead.tsx

@@ -113,13 +113,8 @@ const ListingRead = memo(function Listing({
     async function loadExistingThread() {
       if (!supabase) return;
       const { data: thread, error } = await supabase
-        .from("chat_threads_with_participants")
-        .select(
-          `
-          *,
-          chat_messages_with_senders (*)
-        `
-        )
+        .from("chat_threads")
+        .select("id, created_at, listing_id, initiator_id, owner_id")
         .match({
           listing_id: listingId,
           initiator_id: userId,
@@ -132,11 +127,31 @@ const ListingRead = memo(function Listing({
         return;
       }
 
-      setExistingThread(thread);
+      if (!thread) {
+        setExistingThread(null);
+        return;
+      }
+
+      const { data: messages, error: messagesError } = await supabase
+        .from("chat_messages")
+        .select("id, content, created_at, read_at, sender_id, thread_id")
+        .eq("thread_id", thread.id)
+        .order("created_at", { ascending: true });
+
+      if (messagesError) {
+        console.error("Error loading thread messages:", messagesError);
+        return;
+      }
+
+      setExistingThread({
+        ...thread,
+        listing: realListing,
+        messages: messages ?? [],
+      });
     }
 
     loadExistingThread();
-  }, [listingId, listingOwnerId, userId, isDemo, supabase]);
+  }, [listingId, listingOwnerId, userId, isDemo, supabase, realListing]);
 
   const initialZoomLevel = 14;
   const listingDisplayNameCopy = useMemo(

src/components/PeelsFeaturedHostsPhotos/PeelsFeaturedHostsPhotos.tsx

@@ -88,7 +88,7 @@ function PeelsFeaturedHostsPhotos() {
   useEffect(() => {
     const loadListings = async () => {
       const { data, error } = await supabase
-        .from("listings_public_data")
+        .from("public_listings")
         .select(
           "slug, name, photos, type, is_stub, homepage_featured, homepage_featured_photo_indexes"
         )

src/data/demo/threads.ts

@@ -1,6 +1,6 @@
 type DemoThread = {
   id: string;
-  chat_messages_with_senders: Array<{
+  messages: Array<{
     id: string;
     content: string;
     created_at: string;
@@ -15,7 +15,7 @@ export const DEMO_CHAT_REFERENCE_TIME = "2025-05-02T09:02:00.000Z";
 export const demoThreads: DemoThread[] = [
   {
     id: "demo-thread-1",
-    chat_messages_with_senders: [
+    messages: [
       {
         id: "demo-thread-1-message-1",
         content: "Hey Becca, are you still accepting food scraps?",