Merge branch 'main' of https://github.com/project-fika/Fika-Server

project-fika · Dec 22, 2024 · 8396df2 · 8396df2
2 parents ae11595 + 6d885df
commit 8396df2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/src/callbacks/FikaPresenceCallbacks.ts b/src/callbacks/FikaPresenceCallbacks.ts
@@ -3,9 +3,10 @@ import { inject, injectable } from "tsyringe";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 
 import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import { FikaPresenceService } from "../services/FikaPresenceService";
+import { EFikaPlayerPresences } from "../models/enums/EFikaPlayerPresences";
 import { IFikaPlayerPresence } from "../models/fika/presence/IFikaPlayerPresence";
 import { IFikaSetPresence } from "../models/fika/presence/IFikaSetPresence";
+import { FikaPresenceService } from "../services/FikaPresenceService";
 
 @injectable()
 export class FikaPresenceCallbacks {
@@ -23,15 +24,27 @@ export class FikaPresenceCallbacks {
 
     /** Handle /fika/presence/set */
     public handleSetPresence(_url: string, data: IFikaSetPresence, sessionID: string): INullResponseData {
+        data.activity = this.setActivityValue(data.activity);
+
         this.fikaPresenceService.updatePlayerPresence(sessionID, data);
 
         return this.httpResponseUtil.nullResponse();
     }
 
     /** Handle /fika/presence/setget */
     public handleSetGetPresence(_url: string, data: IFikaSetPresence, sessionID: string): IFikaPlayerPresence {
+        data.activity = this.setActivityValue(data.activity);
+
         this.fikaPresenceService.updatePlayerPresence(sessionID, data);
 
         return this.httpResponseUtil.noBody(this.fikaPresenceService.getAllPlayersPresence());
     }
+
+    protected setActivityValue(presence: EFikaPlayerPresences): EFikaPlayerPresences {
+        if (Object.keys(EFikaPlayerPresences).includes(presence.toString())) {
+            presence = EFikaPlayerPresences[presence.toString()];
+        }
+
+        return presence;
+    }
 }
diff --git a/src/controllers/FikaRaidController.ts b/src/controllers/FikaRaidController.ts
@@ -73,7 +73,6 @@ export class FikaRaidController {
         return {
             serverId: request.serverId,
             timestamp: match.timestamp,
-            expectedNumberOfPlayers: match.expectedNumberOfPlayers,
             gameVersion: match.gameVersion,
             fikaVersion: match.fikaVersion,
             raidCode: match.raidCode,

diff --git a/src/models/fika/IFikaMatch.ts b/src/models/fika/IFikaMatch.ts
@@ -11,7 +11,6 @@ export interface IFikaMatch {
     port: number;
     hostUsername: string;
     timestamp: string;
-    expectedNumberOfPlayers: number;
     fikaVersion: string;
     gameVersion: string;
     raidConfig: IGetRaidConfigurationRequestData;

diff --git a/src/models/fika/routes/raid/create/IFikaRaidCreateRequestData.ts b/src/models/fika/routes/raid/create/IFikaRaidCreateRequestData.ts
@@ -8,7 +8,6 @@ export interface IFikaRaidCreateRequestData {
     hostUsername: string;
     timestamp: string;
     settings: IGetRaidConfigurationRequestData;
-    expectedNumberOfPlayers: number;
     gameVersion: string;
     fikaVersion: string;
     side: EFikaSide;

diff --git a/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts b/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts
@@ -4,7 +4,6 @@ import { PlayersSpawnPlace } from "@spt/models/enums/PlayersSpawnPlace";
 import { SideType } from "@spt/models/enums/SideType";
 
 export interface IStartDedicatedRequest {
-    expectedNumberOfPlayers: number;
     time: DateTime;
     locationId: string;
     spawnPlace: PlayersSpawnPlace;

diff --git a/src/models/fika/routes/raid/join/IFikaRaidJoinResponse.ts b/src/models/fika/routes/raid/join/IFikaRaidJoinResponse.ts
@@ -1,7 +1,6 @@
 export interface IFikaRaidJoinResponse {
     serverId: string;
     timestamp: string;
-    expectedNumberOfPlayers: number;
     gameVersion: string;
     fikaVersion: string;
     raidCode: string;

diff --git a/src/services/FikaMatchService.ts b/src/services/FikaMatchService.ts
@@ -196,7 +196,6 @@ export class FikaMatchService {
             port: null,
             hostUsername: data.hostUsername,
             timestamp: data.timestamp,
-            expectedNumberOfPlayers: data.expectedNumberOfPlayers,
             raidConfig: data.settings,
             locationData: locationData,
             status: EFikaMatchStatus.LOADING,
@@ -209,7 +208,7 @@ export class FikaMatchService {
             raidCode: data.raidCode,
             natPunch: false,
             isDedicated: false,
-            raids: 0
+            raids: 0,
         });
 
         this.addTimeoutInterval(data.serverId);