fixes images (mckaywrigley#1234)

jollytoad · Jan 22, 2024 · 7e2ad98 · 7e2ad98
1 parent 62e8b0b
commit 7e2ad98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/app/[locale]/login/page.tsx b/app/[locale]/login/page.tsx
@@ -8,7 +8,7 @@ import { createServerClient } from "@supabase/ssr"
 import { Metadata } from "next"
 import { cookies, headers } from "next/headers"
 import { redirect } from "next/navigation"
-import { get } from '@vercel/edge-config';
+import { get } from "@vercel/edge-config"
 
 export const metadata: Metadata = {
   title: "Login"
@@ -64,10 +64,10 @@ export default async function Login({
     const password = formData.get("password") as string
 
     if (process.env.EMAIL_DOMAIN_WHITELIST || process.env.EDGE_CONFIG) {
-      let patternsString = process.env.EMAIL_DOMAIN_WHITELIST;
+      let patternsString = process.env.EMAIL_DOMAIN_WHITELIST
 
       if (process.env.EDGE_CONFIG)
-        patternsString = await get<string>('EMAIL_DOMAIN_WHITELIST');
+        patternsString = await get<string>("EMAIL_DOMAIN_WHITELIST")
 
       const emailDomainWhitelist = patternsString?.split(",") ?? []
 
@@ -82,10 +82,10 @@ export default async function Login({
     }
 
     if (process.env.EMAIL_WHITELIST || process.env.EDGE_CONFIG) {
-      let patternsString = process.env.EMAIL_WHITELIST;
+      let patternsString = process.env.EMAIL_WHITELIST
 
       if (process.env.EDGE_CONFIG)
-        patternsString = await get<string>('EMAIL_WHITELIST');
+        patternsString = await get<string>("EMAIL_WHITELIST")
 
       const emailWhitelist = patternsString?.split(",") ?? []
 

diff --git a/components/chat/chat-helpers/index.ts b/components/chat/chat-helpers/index.ts
@@ -444,9 +444,10 @@ export const handleCreateMessages = async (
 
     setChatImages(prevImages => [
       ...prevImages,
-      ...newMessageImages.map(obj => ({
+      ...newMessageImages.map((obj, index) => ({
         ...obj,
-        messageId: createdMessages[0].id
+        messageId: createdMessages[0].id,
+        path: paths[index]
       }))
     ])
 

diff --git a/components/messages/message.tsx b/components/messages/message.tsx
@@ -319,9 +319,7 @@ export const Message: FC<MessageProps> = ({
 
         <div className="mt-3 flex flex-wrap gap-2">
           {message.image_paths.map((path, index) => {
-            const item = chatImages.find(
-              image => image.messageId === message.id
-            )
+            const item = chatImages.find(image => image.path === path)
 
             return (
               <Image