From e6187760138889cd03ed8e7ff91e7d1683564352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=97=D0=BB=20=D0=93=D1=80=D0=B8?= =?UTF-8?q?=D0=B3=D0=BE=D1=80=27=D1=94=D0=B2?= Date: Fri, 26 Jul 2024 17:01:57 +0300 Subject: [PATCH] Minor globalConfig and unused code cleanup Remove secrets that are no longer used and fetchDiscounts preload step. --- src/js/core/config.js | 8 -------- src/js/states/preload.js | 25 +++---------------------- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/js/core/config.js b/src/js/core/config.js index 5fb7e2e1..7ec96d39 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -114,18 +114,10 @@ export const globalConfig = { rendering: {}, debug, - currentDiscount: 0, - // Secret vars info: { // Binary file salt file: "Ec'])@^+*9zMevK3uMV4432x9%iK'=", - - // Savegame salt - sgSalt: "}95Q3%8/.837Lqym_BJx%q7)pAHJbF", - - // Analytics key - analyticsApiKey: "baf6a50f0cc7dfdec5a0e21c88a1c69a4b34bc4a", }, }; diff --git a/src/js/states/preload.js b/src/js/states/preload.js index c58f63da..7799d7cf 100644 --- a/src/js/states/preload.js +++ b/src/js/states/preload.js @@ -2,10 +2,10 @@ import { CHANGELOG } from "../changelog"; import { globalConfig } from "../core/config"; import { GameState } from "../core/game_state"; import { createLogger } from "../core/logging"; -import { getLogoSprite, timeoutPromise } from "../core/utils"; +import { getLogoSprite } from "../core/utils"; import { getRandomHint } from "../game/hints"; import { HUDModalDialogs } from "../game/hud/parts/modal_dialogs"; -import { autoDetectLanguageId, T, updateApplicationLanguage } from "../translations"; +import { T, autoDetectLanguageId, updateApplicationLanguage } from "../translations"; const logger = createLogger("state/preload"); @@ -44,22 +44,6 @@ export class PreloadState extends GameState { this.startLoading(); } - async fetchDiscounts() { - await timeoutPromise( - fetch("https://analytics.shapez.io/v1/discounts") - .then(res => res.json()) - .then(data => { - globalConfig.currentDiscount = Number( - data["1318690"].data.price_overview.discount_percent - ); - logger.log("Fetched current discount:", globalConfig.currentDiscount); - }), - 2000 - ).catch(err => { - logger.warn("Failed to fetch current discount:", err); - }); - } - async sendBeacon() { // TODO: Get rid of this analytics stuff } @@ -78,9 +62,6 @@ export class PreloadState extends GameState { return this.app.storage.initialize(); }) - .then(() => this.setStatus("Connecting to api", 15)) - .then(() => this.fetchDiscounts()) - .then(() => this.setStatus("Initializing settings", 20)) .then(() => { return this.app.settings.initialize(); @@ -256,7 +237,7 @@ export class PreloadState extends GameState { subElement.innerHTML = `