Revert way too esoteric object construction for my liking

IsThereAnyDeal · Aug 28, 2024 · 10c076c · 10c076c
1 parent 5357a7a
commit 10c076c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/js/Content/Features/Store/App/FSaveReviewFilters.ts b/src/js/Content/Features/Store/App/FSaveReviewFilters.ts
@@ -1,6 +1,6 @@
 import Feature from "@Content/Modules/Context/Feature";
 import type CApp from "@Content/Features/Store/App/CApp";
-import LocalStorage from "@Core/Storage/LocalStorage";
+import LocalStorage, {type LocalStorageSchema} from "@Core/Storage/LocalStorage";
 import DOMHelper from "@Content/Modules/DOMHelper";
 
 export default class FSaveReviewFilters extends Feature<CApp> {
@@ -17,13 +17,13 @@ export default class FSaveReviewFilters extends Feature<CApp> {
             const minPlaytime = document.querySelector<HTMLInputElement>("#app_reviews_playtime_range_min")?.value;
             const maxPlaytime = document.querySelector<HTMLInputElement>("#app_reviews_playtime_range_max")?.value;
 
-            LocalStorage.set("review_filters", {
-                ...((await LocalStorage.get("review_filters")) ?? {}),
-                context,
-                language,
-                ...(minPlaytime && {minPlaytime}),
-                ...(maxPlaytime && {maxPlaytime})
-            });
+            const value: LocalStorageSchema["review_filters"] = (await LocalStorage.get("review_filters")) ?? {};
+            if (context) { value.context = context; }
+            if (language) { value.language = language; }
+            if (minPlaytime) { value.minPlaytime = minPlaytime; }
+            if (maxPlaytime) { value.maxPlaytime = maxPlaytime; }
+
+            LocalStorage.set("review_filters", value);
         });
 
         DOMHelper.insertScript("scriptlets/Store/App/saveReviewFilters.js",

diff --git a/src/js/Core/Storage/LocalStorage.ts b/src/js/Core/Storage/LocalStorage.ts
@@ -9,7 +9,7 @@ interface CacheEntry<V = unknown> {
     expiry: number
 }
 
-interface LocalStorageSchema extends StorageSchema {
+export interface LocalStorageSchema extends StorageSchema {
     login: TLogin,
     storeCountry: string,
     currency: CacheEntry<string>,
@@ -41,8 +41,8 @@ interface LocalStorageSchema extends StorageSchema {
         expiry: number
     },
     review_filters: {
-        context: string|undefined,
-        language: string|undefined,
+        context?: string,
+        language?: string,
         minPlaytime?: string,
         maxPlaytime?: string
     }