Move getPlatform to shared code

fishpondstudio · Mar 5, 2025 · e69a43f · e69a43f
1 parent b4ebc92
commit e69a43f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/server b/server
diff --git a/shared/utilities/DatabaseShared.ts b/shared/utilities/DatabaseShared.ts
@@ -1,5 +1,5 @@
 import { MAX_CHAT_PER_CHANNEL } from "../logic/Constants";
-import type { IPlatformInfo, IUser } from "./Database";
+import { Platform, type IPlatformInfo, type IUser } from "./Database";
 import { safeAdd } from "./Helper";
 
 export function vacuumChat<T extends { channel: string } | object>(old: T[]): T[] {
@@ -28,3 +28,19 @@ export function isSaveOwner(info: IPlatformInfo, user: IUser): boolean {
    }
    return false;
 }
+
+export function getPlatform(userId: string | null | undefined): Platform {
+   if (!userId) {
+      return Platform.None;
+   }
+   if (userId.startsWith("steam:")) {
+      return Platform.Steam;
+   }
+   if (userId.startsWith("ios:")) {
+      return Platform.iOS;
+   }
+   if (userId.startsWith("android:")) {
+      return Platform.Android;
+   }
+   return Platform.None;
+}
diff --git a/src/scripts/ui/CrossPlatformSavePage.tsx b/src/scripts/ui/CrossPlatformSavePage.tsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
-import { getPlatform } from "../../../server/src/DatabaseHelper";
 import { Platform } from "../../../shared/utilities/Database";
+import { getPlatform } from "../../../shared/utilities/DatabaseShared";
 import { isNullOrUndefined } from "../../../shared/utilities/Helper";
 import { L, t } from "../../../shared/utilities/i18n";
 import "../../css/CrossPlatformSavePage.css";

diff --git a/src/scripts/ui/StatisticsBuildingBody.tsx b/src/scripts/ui/StatisticsBuildingBody.tsx
@@ -589,8 +589,7 @@ function ResourcesTab({ gameState }: IBuildingComponentProps): React.ReactNode {
                const input = inputs.get(res) ?? 0;
                const deficit = output - input;
                const amount = Tick.current.resourceAmount.get(res) ?? 0;
-               const timeLeft =
-                  deficit < 0 ? Math.abs((1000 * amount ?? 0) / deficit) : Number.POSITIVE_INFINITY;
+               const timeLeft = deficit < 0 ? Math.abs((1000 * amount) / deficit) : Number.POSITIVE_INFINITY;
 
                return (
                   <tr key={res}>