SyntaxSquad/DADProject#16 merge: fix merge conflics

websockets/server.js

@@ -3,6 +3,7 @@ import axios from "axios";
 import { handleConnectionEvents } from "./events/connection.js";
 import { addUser, removeUser } from "./state/connection.js";
 import gameEvents from "./events/game.js";
+import matchEvents from "./events/match.js";
 
 export const server = {
   io: null,
@@ -46,6 +47,7 @@ export const serverStart = (port) => {
       }
 
       socket.user = user;
+      socket.token = token;
       socket.handshake.auth.token = token; 
 
       if (disconnectTimers.has(user.id)) {
@@ -75,7 +77,9 @@ export const serverStart = (port) => {
     gameEvents(server.io, socket);
     console.log(`[Connection] User ${userId} connected. Socket ID: ${socket.id}`);
 
-    handleConnectionEvents(socket);
+    matchEvents(server.io, socket);
+
+    handleConnectionEvents(server.io, socket);
 
     socket.on("disconnect", () => {
       // Remove from active socket list