refactor: clean up

Removing pointless spread operators and removes some unsafe stuff

components/candle/challengeService.ts

@@ -533,8 +533,8 @@ export abstract class ChallengeRegistry {
         return parseContextListeners(
             challenge.Definition?.ContextListeners || {},
             {
-                ...(Context || challenge.Definition?.Context || {}),
-                ...(challenge.Definition?.Constants || {}),
+                ...(Context || challenge.Definition?.Context),
+                ...challenge.Definition?.Constants,
             },
         )
     }

components/contracts/contractRouting.ts

@@ -105,10 +105,8 @@ contractRoutingRouter.post(
                       req.gameVersion,
                   )
                 : {}),
-            ...(loadoutData || {}),
-            ...{
-                OpportunityData: getContractOpportunityData(req, contractData),
-            },
+            ...loadoutData,
+            OpportunityData: getContractOpportunityData(req, contractData),
         }
 
         // Edit usercreated contract data HERE

components/discord/ipc.ts

@@ -95,7 +95,7 @@ async function findEndpoint(tries = 0): Promise<string> {
         }
 
         return findEndpoint(tries + 1)
-    } catch (e) {
+    } catch {
         return findEndpoint(tries + 1)
     }
 }
@@ -138,7 +138,7 @@ function decode(socket: net.Socket, callback): void {
         callback({ op, data })
         working.full = ""
         working.op = undefined
-    } catch (err) {
+    } catch {
         working.full += raw
     }
 

components/menuData.ts

@@ -205,10 +205,8 @@ menuDataRouter.get(
 
             data = {
                 ...data,
-                ...{
-                    Name: pack ? pack.Name : location.DisplayNameLocKey,
-                    Location: location,
-                },
+                Name: pack ? pack.Name : location.DisplayNameLocKey,
+                Location: location,
             }
         } else {
             data = {

components/menus/destinations.ts

@@ -209,13 +209,11 @@ export function getAllGameDestinations(
 
         const template: GameFacingDestination = {
             ...getDestinationCompletion(parent, undefined, gameVersion, userId),
-            ...{
-                CompletionData: generateCompletionData(
-                    destination,
-                    userId,
-                    gameVersion,
-                ),
-            },
+            CompletionData: generateCompletionData(
+                destination,
+                userId,
+                gameVersion,
+            ),
         }
 
         // TODO: THIS IS NOT CORRECT FOR 2016!
@@ -379,7 +377,7 @@ export function getDestination(
                 gameVersion,
                 userId,
             ),
-            ...{ SubLocationMissionsData: [] },
+            SubLocationMissionsData: [],
         },
         ChallengeData: {
             Children:
@@ -510,16 +508,14 @@ export function getDestination(
         }
 
         const types = [
-            ...[
-                [undefined, "Missions"],
-                ["elusive", "ElusiveMissions"],
-            ],
             ...((gameVersion === "h1" &&
                 // @ts-expect-error Hack.
                 missionsInLocations.sarajevo["h2016enabled"]) ||
             gameVersion === "h3"
                 ? [["sarajevo", "SarajevoSixMissions"]]
                 : []),
+            [undefined, "Missions"],
+            ["elusive", "ElusiveMissions"],
         ]
 
         for (const t of types) {

components/oauthToken.ts

@@ -187,7 +187,7 @@ export async function handleOAuthToken(
                     gameVersion,
                 )
             ).toString()
-        } catch (e) {
+        } catch {
             req.body.pId = randomUUID()
             await writeExternalUserData(
                 external_userid,

components/scoreHandler.ts

@@ -432,7 +432,7 @@ export function calculateSniperScore(
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const baseScore = (contractSession.scoring?.Context as any)["TotalScore"]
+    const baseScore = (contractSession.scoring?.Context as any)?.["TotalScore"]
     // @ts-expect-error it's a number
     const challengeMultiplier = contractSession.scoring?.Settings["challenges"][
         "Unlockables"

components/utils.ts

@@ -100,7 +100,7 @@ export async function checkForUpdates(): Promise<void> {
                 "updates",
             )
         }
-    } catch (e) {
+    } catch {
         log(LogLevel.WARN, "Failed to check for updates!", "updates")
     }
 }

components/webFeatures.ts

@@ -202,7 +202,7 @@ webFeaturesRouter.get(
 
         try {
             await loadUserData(req.query.user, req.query.gv)
-        } catch (e) {
+        } catch {
             formErrorMessage(res, "Failed to load user data.")
             return
         }
@@ -253,7 +253,7 @@ webFeaturesRouter.get(
     async (req: CommonRequest, res) => {
         try {
             await loadUserData(req.query.user, req.query.gv)
-        } catch (e) {
+        } catch {
             formErrorMessage(res, "Failed to load user data.")
             return
         }

packaging/extractFeaturedContracts.mjs

@@ -29,7 +29,7 @@ import axios from "axios"
  * @param gameVersion
  * @returns {Promise<*>}
  */
-async function fetchHitsCategoryPage(axiosClient, type, page, gameVersion) {
+async function fetchHitsCategoryPage(axiosClient, type, page) {
     console.log(`${pc.blue`Fetching hits category `}${type} page ${page}...`)
 
     const url = `/profiles/page/HitsCategory?page=${page}&type=${type}&mode=dataonly`

webui/src/EscalationLevelPicker.tsx

@@ -204,7 +204,11 @@ export function EscalationLevelPicker({
         <section className="app-grid">
             {Object.keys(final).map((val) => {
                 return (
-                    <div className="container" style={{ padding: "15px" }}>
+                    <div
+                        className="container"
+                        style={{ padding: "15px" }}
+                        key={val}
+                    >
                         <h1>{val}</h1>
                         {final[val].map((row, index) => (
                             <div className="row" key={index}>