Fix string->num to only work in clj

mtgred · Jul 18, 2024 · 178a07e · 178a07e
1 parent 1d42bf7
commit 178a07e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/clj/game/core/servers.cljc b/src/clj/game/core/servers.cljc
@@ -62,7 +62,7 @@
     :archives -3
     :rd -2
     :hq -1
-    (string->num
+    (parse-long
       (last (safe-split (str zone) #":remote")))))
 
 (defn zones->sorted-names

diff --git a/src/clj/game/utils.cljc b/src/clj/game/utils.cljc
@@ -45,10 +45,11 @@
                             (cons x (step more (conj seen k))))))))]
     (step coll #{})))
 
-(defn string->num [s]
-  (cond
-    (number? s) s
-    (string? s) (parse-long s)))
+#?(:clj (defn string->num [s]
+          (try
+            (let [num (bigdec s)]
+              (if (and (> num Integer/MIN_VALUE) (< num Integer/MAX_VALUE)) (int num) num))
+            (catch Exception _ nil))))
 
 (def safe-split (fnil str/split ""))