diff --git a/src/controllers/api/findSessionsController.ts b/src/controllers/api/findSessionsController.ts index caa326b9..5a1f4301 100644 --- a/src/controllers/api/findSessionsController.ts +++ b/src/controllers/api/findSessionsController.ts @@ -4,13 +4,13 @@ import { getSession } from "@/src/managers/sessionManager"; const findSessionsController: RequestHandler = (_req, res) => { console.log("FindSession Request:", JSON.parse(_req.body)); let r = JSON.parse(_req.body); - if (r != undefined) { + if (r.id != undefined) { console.log("Found ID"); let s = getSession(r.id); if (s) res.json({ queryId: r.queryId, Sessions: s }); else res.json({}); - } else if (r != undefined) { + } else if (r.originalSessionId != undefined) { console.log("Found OriginalSessionID"); let s = getSession(r.originalSessionId); diff --git a/src/controllers/api/getNewRewardSeedController.ts b/src/controllers/api/getNewRewardSeedController.ts index f420f60f..163e3c6e 100644 --- a/src/controllers/api/getNewRewardSeedController.ts +++ b/src/controllers/api/getNewRewardSeedController.ts @@ -1,7 +1,7 @@ import { RequestHandler } from "express"; const getNewRewardSeedController: RequestHandler = (_req, res) => { - res.json({ rewardSeed: 1111111111 }); + res.json({ rewardSeed: generateRewardSeed() }); }; function generateRewardSeed(): number { diff --git a/src/managers/sessionManager.ts b/src/managers/sessionManager.ts index ecb163a1..9ac12327 100644 --- a/src/managers/sessionManager.ts +++ b/src/managers/sessionManager.ts @@ -1,30 +1,4 @@ -interface Session { - sessionId: string; - creatorId: string; - maxPlayers: number; - minPlayers: number; - privateSlots: number; - scoreLimit: number; - timeLimit: number; - gameModeId: number; - eloRating: number; - regionId: number; - difficulty: number; - hasStarted: boolean; - enableVoice: boolean; - matchType: string; - maps: string[]; - originalSessionId: string; - customSettings: string; - rewardSeed: number; - guildId: string; - buildId: number; - platform: number; - xplatform: boolean; - freePublic: number; - freePrivate: number; - fullReset: number; -} +import { Session, FindSessionRequest } from "@/src/types/session"; const sessions: Session[] = []; @@ -69,10 +43,6 @@ function getSessionByID(sessionId: string): Session | undefined { return sessions.find(session => session.sessionId === sessionId); } -interface FindSessionRequest { - [key: string]: any; -} - function getSession(sessionIdOrRequest: string | FindSessionRequest): any[] { if (typeof sessionIdOrRequest === "string") { const session = sessions.find(session => session.sessionId === sessionIdOrRequest); @@ -130,7 +100,7 @@ function getNewSessionID(): string { function updateSession(sessionId: string, sessionData: string): boolean { const session = sessions.find(session => session.sessionId === sessionId); - if (session) { + if (!session) return false; try { const updatedData = JSON.parse(sessionData); Object.assign(session, updatedData); @@ -139,8 +109,6 @@ function updateSession(sessionId: string, sessionData: string): boolean { console.error("Invalid JSON string for session update."); return false; } - } - return false; } function deleteSession(sessionId: string): boolean { diff --git a/src/types/session.ts b/src/types/session.ts new file mode 100644 index 00000000..f4c06274 --- /dev/null +++ b/src/types/session.ts @@ -0,0 +1,27 @@ +export interface Session { + sessionId: string; + creatorId: string; + maxPlayers: number; + minPlayers: number; + privateSlots: number; + scoreLimit: number; + timeLimit: number; + gameModeId: number; + eloRating: number; + regionId: number; + difficulty: number; + hasStarted: boolean; + enableVoice: boolean; + matchType: string; + maps: string[]; + originalSessionId: string; + customSettings: string; + rewardSeed: number; + guildId: string; + buildId: number; + platform: number; + xplatform: boolean; + freePublic: number; + freePrivate: number; + fullReset: number; +} \ No newline at end of file