Merge pull request #6 from stephan-rz/development

realtime issue fixed
stephan-rz · May 19, 2024 · 7399220 · 7399220
2 parents 0818638 + bcac70d
commit 7399220
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 25 deletions.
diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.ts
@@ -61,7 +61,6 @@ export async function POST(
             }
         });
 
-
         await pusherServer.trigger(conversationId, 'messages:new', newMessage);
 
         const lastMessage = updatedConversation.messages[updatedConversation.messages.length - 1];
@@ -73,8 +72,6 @@ export async function POST(
             })
         })
 
-
-
         return NextResponse.json(newMessage)
     } catch (error) {
         console.log(error, 'ERROR_MESSAGES');

diff --git a/src/app/api/test/route.ts b/src/app/api/test/route.ts
diff --git a/src/components/conversations/chat-body.tsx b/src/components/conversations/chat-body.tsx
@@ -23,7 +23,7 @@ const ChatBody = ({ initialMessages }: ChatBodyProps) => {
     }, [conversationId]);
 
     useEffect(() => {
-        pusherClient.subscribe(conversationId[0]);
+        pusherClient.subscribe(conversationId as string);
         bottomRef?.current?.scrollIntoView();
 
         const messageHandler = (message: FullMessageType) => {

diff --git a/src/lib/pusher.ts b/src/lib/pusher.ts
@@ -4,7 +4,7 @@ import PusherClient from 'pusher-js';
 export const pusherServer = new PusherServer({
     appId: process.env.PUSHER_APP_ID!,
     key: process.env.NEXT_PUBLIC_PUSHER_APP_KEY!,
-    secret: process.env.PUSHER_APP_SECRET!,
+    secret: process.env.PUSHER_SECRET!,
     cluster: 'ap2',
     useTLS: true,
 

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -3,7 +3,6 @@ import NextAuth from "next-auth";
 import authConfig from "./auth.config";
 
 import { DEFAULT_LOGIN_REDIRECT, apiAuthPrefix, authRoutes, publicRoutes } from "@/routes"
-import { getUserData } from "./data/session";
 
 const { auth } = NextAuth(authConfig)
 //@ts-ignore