From ee1d391102dfad3dd74137b3f4c1e0f20fd44e87 Mon Sep 17 00:00:00 2001
From: slawk0 <justgetahouse4@pm.me>
Date: Wed, 26 Mar 2025 20:00:29 +0100
Subject: [PATCH] finito

---
 client/.gitignore                                      | 2 +-
 client/src/components/chat/chatArea/MessageElement.tsx | 4 ++--
 client/src/components/chat/chatArea/MessagesArea.tsx   | 4 ++--
 client/src/components/chat/leftSidebar/ContactForm.tsx | 2 +-
 client/src/context/chat/ChatProvider.tsx               | 1 +
 client/src/socket/socket.ts                            | 2 ++
 client/src/utils/AuthProvider.tsx                      | 5 +++++
 server/server.js                                       | 8 +-------
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/client/.gitignore b/client/.gitignore
index cf613ef..4780113 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -16,7 +16,7 @@ dist-ssr
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
-.idea
+.idea/
 .DS_Store
 *.suo
 *.ntvs*
diff --git a/client/src/components/chat/chatArea/MessageElement.tsx b/client/src/components/chat/chatArea/MessageElement.tsx
index ac9cf93..79b5c0b 100644
--- a/client/src/components/chat/chatArea/MessageElement.tsx
+++ b/client/src/components/chat/chatArea/MessageElement.tsx
@@ -6,12 +6,12 @@ import { useChat } from '@/context/chat/useChat.ts';
 import { AuthContext } from '@/utils/AuthProvider.tsx';
 import { format, isToday, isYesterday, formatDistanceToNow } from 'date-fns';
 
-type AnimatedMessageProps = {
+type MessageElementProps = {
   message: ChatMessagesProps;
   onDelete: (messageId: number) => void;
 };
 
-const MessageElement = ({ onDelete, message }: AnimatedMessageProps) => {
+const MessageElement = ({ onDelete, message }: MessageElementProps) => {
   const { user } = useContext(AuthContext);
   const { me, groupOwner } = useChat();
   const [isRemoving, setIsRemoving] = useState(false);
diff --git a/client/src/components/chat/chatArea/MessagesArea.tsx b/client/src/components/chat/chatArea/MessagesArea.tsx
index ae95706..e6cb264 100644
--- a/client/src/components/chat/chatArea/MessagesArea.tsx
+++ b/client/src/components/chat/chatArea/MessagesArea.tsx
@@ -2,7 +2,7 @@ import { useContext, useEffect, useRef, useState, useCallback } from 'react';
 import { socket } from '@/socket/socket.ts';
 import { sendContact } from '@/api/contactsApi.tsx';
 import LoadingWheel from '../LoadingWheel.tsx';
-import AnimatedMessage from '@/components/chat/chatArea/MessageElement.tsx';
+import MessageElement from '@/components/chat/chatArea/MessageElement.tsx';
 import { ChatMessagesProps } from '@/types/types.ts';
 import { useChat } from '@/context/chat/useChat.ts';
 import { AuthContext } from '@/utils/AuthProvider.tsx';
@@ -248,7 +248,7 @@ function MessagesArea() {
       <ul className="flex-grow list-none">
         {isLoading ? <LoadingWheel /> : null}
         {messages.map((msg: ChatMessagesProps) => (
-          <AnimatedMessage
+          <MessageElement
             key={msg.message_id}
             message={msg}
             onDelete={() => deleteMessage(msg.message_id)}
diff --git a/client/src/components/chat/leftSidebar/ContactForm.tsx b/client/src/components/chat/leftSidebar/ContactForm.tsx
index 1f1d39e..0867561 100644
--- a/client/src/components/chat/leftSidebar/ContactForm.tsx
+++ b/client/src/components/chat/leftSidebar/ContactForm.tsx
@@ -69,7 +69,7 @@ function ContactForm() {
 
       console.log('Submit contact: ', contactToSubmit);
       const response: AxiosResponse<ContactsProps> = await axiosClient.post(
-        `/api/chat/contact/${contactToSubmit}`,
+        `/api/chat/contacts/${contactToSubmit}`,
       );
 
       console.log('contact post response: ', response.data);
diff --git a/client/src/context/chat/ChatProvider.tsx b/client/src/context/chat/ChatProvider.tsx
index 158f188..8c048a5 100644
--- a/client/src/context/chat/ChatProvider.tsx
+++ b/client/src/context/chat/ChatProvider.tsx
@@ -27,6 +27,7 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
     console.log('Initialized contact: ', newContact);
     try {
       const joinResult = await joinRoom(newContact.conversation_id);
+
       if (!joinResult.success) {
         setErrorMessage(joinResult.message);
         return false;
diff --git a/client/src/socket/socket.ts b/client/src/socket/socket.ts
index 7912856..24691e4 100644
--- a/client/src/socket/socket.ts
+++ b/client/src/socket/socket.ts
@@ -1,4 +1,5 @@
 import io from 'socket.io-client';
+
 import Socket = SocketIOClient.Socket;
 let socket: Socket | null = null;
 function initializeSocket(token: string): Socket | null {
@@ -8,6 +9,7 @@ function initializeSocket(token: string): Socket | null {
       reconnection: true,
       reconnectionAttempts: 5,
       reconnectionDelay: 1000,
+      transports: ['websocket', 'pooling'],
     });
 
     socket.on('connect', () => console.log('connected'));
diff --git a/client/src/utils/AuthProvider.tsx b/client/src/utils/AuthProvider.tsx
index 0338a02..f502f5f 100644
--- a/client/src/utils/AuthProvider.tsx
+++ b/client/src/utils/AuthProvider.tsx
@@ -33,6 +33,11 @@ export function AuthProvider({ children }: { children: ReactNode }) {
         const res = await axiosClient.get('/api/auth/validate', {
           withCredentials: true,
         });
+        if (!res.data.user_id) {
+          console.error('user_id is missing');
+          setAuthorized(false);
+          return;
+        }
         setUser({ username: res.data.username, id: res.data.user_id });
         console.info('user: : ', {
           username: res.data.username,
diff --git a/server/server.js b/server/server.js
index ea06f9e..2113165 100644
--- a/server/server.js
+++ b/server/server.js
@@ -249,7 +249,7 @@ app.put(
   },
 );
 
-app.post("/api/chat/contact/:contact", authorizeUser, async (req, res) => {
+app.post("/api/chat/contacts/:contact", authorizeUser, async (req, res) => {
   if (!req.params.contact) {
     return res.status(400).json({ message: "Missing contact parameter" });
   }
@@ -470,12 +470,6 @@ app.get(
   },
 );
 
-app.get(
-  "/api/chat/messages/lastMessage",
-  authorizeUser,
-  async (req, res) => {},
-);
-
 initializeSocket(io);
 
 server.listen(PORT, () => {