Upload files to "static/webui"

Reviewed-on: OpenWF/SpaceNinjaServer#1302

UPDATE AND START SERVER.bat

@@ -3,6 +3,7 @@
 echo Updating SpaceNinjaServer...
 git config remote.origin.url https://openwf.io/SpaceNinjaServer.git
 git fetch --prune
+git stash
 git reset --hard origin/main
 
 if exist static\data\0\ (

src/controllers/api/claimCompletedRecipeController.ts

@@ -118,7 +118,7 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
         }
         InventoryChanges = {
             ...InventoryChanges,
-            ...(await addItem(inventory, recipe.resultType, recipe.num, false)).InventoryChanges
+            ...(await addItem(inventory, recipe.resultType, recipe.num, false))
         };
         await inventory.save();
         res.json({ InventoryChanges });

src/controllers/api/giveStartingGearController.ts

@@ -87,7 +87,7 @@ export const addStartingGear = async (
 
     for (const item of awakeningRewards) {
         const inventoryDelta = await addItem(inventory, item);
-        combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
+        combineInventoryChanges(inventoryChanges, inventoryDelta);
     }
 
     inventory.PlayedParkourTutorial = true;

src/controllers/api/guildTechController.ts

@@ -194,7 +194,7 @@ export const guildTechController: RequestHandler = async (req, res) => {
             ItemCount: x.ItemCount * -1
         }));
         addMiscItems(inventory, inventoryChanges.MiscItems);
-        combineInventoryChanges(inventoryChanges, (await addItem(inventory, recipe.resultType)).InventoryChanges);
+        combineInventoryChanges(inventoryChanges, await addItem(inventory, recipe.resultType));
         await inventory.save();
         // Not a mistake: This response uses `inventoryChanges` instead of `InventoryChanges`.
         res.json({ inventoryChanges: inventoryChanges });

src/controllers/api/updateThemeController.ts

@@ -1,25 +1,23 @@
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { updateTheme } from "@/src/services/inventoryService";
-import { IThemeUpdateRequest } from "@/src/types/requestTypes";
 import { RequestHandler } from "express";
+import { getInventory } from "@/src/services/inventoryService";
 
-const updateThemeController: RequestHandler = async (request, response) => {
+export const updateThemeController: RequestHandler = async (request, response) => {
     const accountId = await getAccountIdForRequest(request);
-    const body = String(request.body);
+    const data = getJSONfromString<IThemeUpdateRequest>(String(request.body));
 
-    try {
+    const inventory = await getInventory(accountId, "ThemeStyle ThemeBackground ThemeSounds");
-        const json = getJSONfromString<IThemeUpdateRequest>(body);
+    if (data.Style) inventory.ThemeStyle = data.Style;
-        if (typeof json !== "object") {
+    if (data.Background) inventory.ThemeBackground = data.Background;
-            throw new Error("Invalid data format");
+    if (data.Sounds) inventory.ThemeSounds = data.Sounds;
-        }
+    await inventory.save();
-
-        await updateTheme(json, accountId);
-    } catch (err) {
-        console.error("Error parsing JSON data:", err);
-    }
 
     response.json({});
 };
 
-export { updateThemeController };
+interface IThemeUpdateRequest {
+    Style?: string;
+    Background?: string;
+    Sounds?: string;
+}

src/controllers/custom/getAccountInfoController.ts

@@ -1,27 +0,0 @@
-import { Guild, GuildMember } from "@/src/models/guildModel";
-import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const getAccountInfoController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    const info: IAccountInfo = {
-        DisplayName: account.DisplayName
-    };
-    if (isAdministrator(account)) {
-        info.IsAdministrator = true;
-    }
-    const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
-    if (guildMember) {
-        const guild = (await Guild.findOne({ _id: guildMember.guildId }, "Ranks"))!;
-        info.GuildId = guildMember.guildId.toString();
-        info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions;
-    }
-    res.json(info);
-};
-
-interface IAccountInfo {
-    DisplayName: string;
-    IsAdministrator?: boolean;
-    GuildId?: string;
-    GuildPermissions?: number;
-}

src/controllers/custom/ircDroppedController.ts

@@ -1,9 +1,24 @@
-import { getAccountForRequest } from "@/src/services/loginService";
+import { Account } from "@/src/models/loginModel";
 import { RequestHandler } from "express";
 
 export const ircDroppedController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
+    if (!req.query.accountId) {
-    account.Dropped = true;
+        throw new Error("Request is missing accountId parameter");
-    await account.save();
+    }
+    const nonce: number = parseInt(req.query.nonce as string);
+    if (!nonce) {
+        throw new Error("Request is missing nonce parameter");
+    }
+
+    await Account.updateOne(
+        {
+            _id: req.query.accountId,
+            Nonce: nonce
+        },
+        {
+            Dropped: true
+        }
+    );
+
     res.end();
 };

src/controllers/custom/renameAccountController.ts

@@ -1,5 +1,6 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest, isNameTaken } from "@/src/services/loginService";
+import { getAccountForRequest, isAdministrator, isNameTaken } from "@/src/services/loginService";
+import { config, saveConfig } from "@/src/services/configService";
 
 export const renameAccountController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
@@ -7,8 +8,18 @@ export const renameAccountController: RequestHandler = async (req, res) => {
         if (await isNameTaken(req.query.newname)) {
             res.status(409).json("Name already in use");
         } else {
+            if (isAdministrator(account)) {
+                for (let i = 0; i != config.administratorNames!.length; ++i) {
+                    if (config.administratorNames![i] == account.DisplayName) {
+                        config.administratorNames![i] = req.query.newname;
+                    }
+                }
+                await saveConfig();
+            }
+
             account.DisplayName = req.query.newname;
             await account.save();
+
             res.end();
         }
     } else {

src/index.ts

@@ -19,9 +19,13 @@ import mongoose from "mongoose";
         return "<BIGINT>" + this.toString() + "</BIGINT>";
     };
     const og_stringify = JSON.stringify;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (JSON as any).stringify = (obj: any): string => {
+    JSON.stringify = (obj: any, replacer?: any, space?: string | number): string => {
-        return og_stringify(obj).split(`"<BIGINT>`).join(``).split(`</BIGINT>"`).join(``);
+        return og_stringify(obj, replacer as string[], space)
+            .split(`"<BIGINT>`)
+            .join(``)
+            .split(`</BIGINT>"`)
+            .join(``);
     };
 }
 

src/routes/custom.ts

@@ -6,7 +6,6 @@ import { pushArchonCrystalUpgradeController } from "@/src/controllers/custom/pus
 import { popArchonCrystalUpgradeController } from "@/src/controllers/custom/popArchonCrystalUpgradeController";
 import { deleteAccountController } from "@/src/controllers/custom/deleteAccountController";
 import { getNameController } from "@/src/controllers/custom/getNameController";
-import { getAccountInfoController } from "@/src/controllers/custom/getAccountInfoController";
 import { renameAccountController } from "@/src/controllers/custom/renameAccountController";
 import { ircDroppedController } from "@/src/controllers/custom/ircDroppedController";
 import { unlockAllIntrinsicsController } from "@/src/controllers/custom/unlockAllIntrinsicsController";
@@ -30,7 +29,6 @@ customRouter.get("/pushArchonCrystalUpgrade", pushArchonCrystalUpgradeController
 customRouter.get("/popArchonCrystalUpgrade", popArchonCrystalUpgradeController);
 customRouter.get("/deleteAccount", deleteAccountController);
 customRouter.get("/getName", getNameController);
-customRouter.get("/getAccountInfo", getAccountInfoController);
 customRouter.get("/renameAccount", renameAccountController);
 customRouter.get("/ircDropped", ircDroppedController);
 customRouter.get("/unlockAllIntrinsics", unlockAllIntrinsicsController);

src/services/configService.ts

@@ -34,7 +34,7 @@ interface IConfig {
     httpsPort?: number;
     myIrcAddresses?: string[];
     NRS?: string[];
-    administratorNames?: string[] | string;
+    administratorNames?: string[];
     autoCreateAccount?: boolean;
     skipTutorial?: boolean;
     skipAllDialogue?: boolean;
@@ -83,10 +83,15 @@ export const updateConfig = async (data: string): Promise<void> => {
     Object.assign(config, JSON.parse(data));
 };
 
+export const saveConfig = async (): Promise<void> => {
+    amnesia = true;
+    await fsPromises.writeFile(configPath, JSON.stringify(config, null, 2));
+};
+
 export const validateConfig = (): void => {
     if (typeof config.administratorNames == "string") {
-        logger.warn(
+        logger.info(`Updating config.json to make administratorNames an array.`);
-            `"administratorNames" should be an array; please add square brackets: ["${config.administratorNames}"]`
+        config.administratorNames = [config.administratorNames];
-        );
+        void saveConfig();
     }
 };

src/services/inventoryService.ts

@@ -29,11 +29,7 @@ import {
     ICrewShipWeaponClient
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
-import {
+import { IMissionInventoryUpdateRequest, IUpdateChallengeProgressRequest } from "../types/requestTypes";
-    IMissionInventoryUpdateRequest,
-    IThemeUpdateRequest,
-    IUpdateChallengeProgressRequest
-} from "../types/requestTypes";
 import { logger } from "@/src/utils/logger";
 import { convertInboxMessage, fromStoreItem, getExalted, getKeyChainItems } from "@/src/services/itemDataService";
 import {
@@ -234,10 +230,10 @@ export const addItem = async (
     typeName: string,
     quantity: number = 1,
     premiumPurchase: boolean = false
-): Promise<{ InventoryChanges: IInventoryChanges }> => {
+): Promise<IInventoryChanges> => {
     // Bundles are technically StoreItems but a) they don't have a normal counterpart, and b) they are used in non-StoreItem contexts, e.g. email attachments.
     if (typeName in ExportBundles) {
-        return { InventoryChanges: await handleBundleAcqusition(typeName, inventory, quantity) };
+        return await handleBundleAcqusition(typeName, inventory, quantity);
     }
 
     // Strict typing
@@ -250,9 +246,7 @@ export const addItem = async (
         ];
         addRecipes(inventory, recipeChanges);
         return {
-            InventoryChanges: {
             Recipes: recipeChanges
-            }
         };
     }
     if (typeName in ExportResources) {
@@ -265,9 +259,7 @@ export const addItem = async (
             ];
             addMiscItems(inventory, miscItemChanges);
             return {
-                InventoryChanges: {
                 MiscItems: miscItemChanges
-                }
             };
         } else if (ExportResources[typeName].productCategory == "FusionTreasures") {
             const fusionTreasureChanges = [
@@ -279,25 +271,21 @@ export const addItem = async (
             ];
             addFusionTreasures(inventory, fusionTreasureChanges);
             return {
-                InventoryChanges: {
                 FusionTreasures: fusionTreasureChanges
-                }
             };
         } else if (ExportResources[typeName].productCategory == "Ships") {
             const oid = await createShip(inventory.accountOwnerId, typeName);
             inventory.Ships.push(oid);
             return {
-                InventoryChanges: {
                 Ships: [
                     {
                         ItemId: { $oid: oid.toString() },
                         ItemType: typeName
                     }
                 ]
-                }
             };
         } else if (ExportResources[typeName].productCategory == "CrewShips") {
-            const inventoryChanges = {
+            return {
                 ...addCrewShip(inventory, typeName),
                 // fix to unlock railjack modding, item bellow supposed to be obtained from archwing quest
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -305,8 +293,6 @@ export const addItem = async (
                     ? addCrewShipHarness(inventory, "/Lotus/Types/Game/CrewShip/RailJack/DefaultHarness")
                     : {})
             };
-
-            return { InventoryChanges: inventoryChanges };
         } else if (ExportResources[typeName].productCategory == "ShipDecorations") {
             const changes = [
                 {
@@ -316,9 +302,7 @@ export const addItem = async (
             ];
             addShipDecorations(inventory, changes);
             return {
-                InventoryChanges: {
                 ShipDecorations: changes
-                }
             };
         } else if (ExportResources[typeName].productCategory == "KubrowPetEggs") {
             const changes: IKubrowPetEggClient[] = [];
@@ -339,9 +323,7 @@ export const addItem = async (
                 });
             }
             return {
-                InventoryChanges: {
                 KubrowPetEggs: changes
-                }
             };
         } else {
             throw new Error(`unknown product category: ${ExportResources[typeName].productCategory}`);
@@ -349,14 +331,13 @@ export const addItem = async (
     }
     if (typeName in ExportCustoms) {
         if (ExportCustoms[typeName].productCategory == "CrewShipWeaponSkins") {
-            return { InventoryChanges: addCrewShipWeaponSkin(inventory, typeName) };
+            return addCrewShipWeaponSkin(inventory, typeName);
         } else {
-            return { InventoryChanges: addSkin(inventory, typeName) };
+            return addSkin(inventory, typeName);
         }
     }
     if (typeName in ExportFlavour) {
-        const inventoryChanges = addCustomization(inventory, typeName);
+        return addCustomization(inventory, typeName);
-        return { InventoryChanges: inventoryChanges };
     }
     if (typeName in ExportUpgrades || typeName in ExportArcanes) {
         const changes = [
@@ -367,9 +348,7 @@ export const addItem = async (
         ];
         addMods(inventory, changes);
         return {
-            InventoryChanges: {
             RawUpgrades: changes
-            }
         };
     }
     if (typeName in ExportGear) {
@@ -381,9 +360,7 @@ export const addItem = async (
         ];
         addConsumables(inventory, consumablesChanges);
         return {
-            InventoryChanges: {
             Consumables: consumablesChanges
-            }
         };
     }
     if (typeName in ExportWeapons) {
@@ -426,14 +403,12 @@ export const addItem = async (
             );
             if (weapon.additionalItems) {
                 for (const item of weapon.additionalItems) {
-                    combineInventoryChanges(inventoryChanges, (await addItem(inventory, item, 1)).InventoryChanges);
+                    combineInventoryChanges(inventoryChanges, await addItem(inventory, item, 1));
                 }
             }
             return {
-                InventoryChanges: {
                 ...inventoryChanges,
                 ...occupySlot(inventory, InventorySlot.WEAPONS, premiumPurchase)
-                }
             };
         } else {
             // Modular weapon parts
@@ -445,36 +420,28 @@ export const addItem = async (
             ];
             addMiscItems(inventory, miscItemChanges);
             return {
-                InventoryChanges: {
                 MiscItems: miscItemChanges
-                }
             };
         }
     }
     if (typeName in ExportRailjackWeapons) {
         return {
-            InventoryChanges: {
             ...addCrewShipWeapon(inventory, typeName),
             ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, premiumPurchase)
-            }
         };
     }
     if (typeName in ExportMisc.creditBundles) {
         const creditsTotal = ExportMisc.creditBundles[typeName] * quantity;
         inventory.RegularCredits += creditsTotal;
         return {
-            InventoryChanges: {
             RegularCredits: creditsTotal
-            }
         };
     }
     if (typeName in ExportFusionBundles) {
         const fusionPointsTotal = ExportFusionBundles[typeName].fusionPoints * quantity;
         inventory.FusionPoints += fusionPointsTotal;
         return {
-            InventoryChanges: {
             FusionPoints: fusionPointsTotal
-            }
         };
     }
     if (typeName in ExportKeys) {
@@ -483,8 +450,8 @@ export const addItem = async (
 
         if (key.chainStages) {
             const key = addQuestKey(inventory, { ItemType: typeName });
-            if (!key) return { InventoryChanges: {} };
+            if (!key) return {};
-            return { InventoryChanges: { QuestKeys: [key] } };
+            return { QuestKeys: [key] };
         } else {
             const key = { ItemType: typeName, ItemCount: quantity };
 
@@ -494,19 +461,14 @@ export const addItem = async (
             } else {
                 inventory.LevelKeys.push(key);
             }
-            return { InventoryChanges: { LevelKeys: [key] } };
+            return { LevelKeys: [key] };
         }
     }
     if (typeName in ExportDrones) {
-        const inventoryChanges = addDrone(inventory, typeName);
+        return addDrone(inventory, typeName);
-        return {
-            InventoryChanges: inventoryChanges
-        };
     }
     if (typeName in ExportEmailItems) {
-        return {
+        return await addEmailItem(inventory, typeName);
-            InventoryChanges: await addEmailItem(inventory, typeName)
-        };
     }
 
     // Path-based duck typing
@@ -515,7 +477,6 @@ export const addItem = async (
             switch (typeName.substr(1).split("/")[2]) {
                 default: {
                     return {
-                        InventoryChanges: {
                         ...addPowerSuit(
                             inventory,
                             typeName,
@@ -523,13 +484,11 @@ export const addItem = async (
                             premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
                         ),
                         ...occupySlot(inventory, InventorySlot.SUITS, premiumPurchase)
-                        }
                     };
                 }
                 case "Archwing": {
                     inventory.ArchwingEnabled = true;
                     return {
-                        InventoryChanges: {
                         ...addSpaceSuit(
                             inventory,
                             typeName,
@@ -537,12 +496,10 @@ export const addItem = async (
                             premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
                         ),
                         ...occupySlot(inventory, InventorySlot.SPACESUITS, premiumPurchase)
-                        }
                     };
                 }
                 case "EntratiMech": {
                     return {
-                        InventoryChanges: {
                         ...addMechSuit(
                             inventory,
                             typeName,
@@ -550,7 +507,6 @@ export const addItem = async (
                             premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
                         ),
                         ...occupySlot(inventory, InventorySlot.MECHSUITS, premiumPurchase)
-                        }
                     };
                 }
             }
@@ -568,9 +524,7 @@ export const addItem = async (
                         ];
                         addMods(inventory, changes);
                         return {
-                            InventoryChanges: {
                             RawUpgrades: changes
-                            }
                         };
                     }
                     break;
@@ -587,9 +541,7 @@ export const addItem = async (
                             ];
                             addMiscItems(inventory, miscItemChanges);
                             return {
-                                InventoryChanges: {
                                 MiscItems: miscItemChanges
-                                }
                             };
                         } else {
                             const changes = [
@@ -600,9 +552,7 @@ export const addItem = async (
                             ];
                             addMods(inventory, changes);
                             return {
-                                InventoryChanges: {
                                 RawUpgrades: changes
-                                }
                             };
                         }
                     }
@@ -613,9 +563,7 @@ export const addItem = async (
         case "Types":
             switch (typeName.substr(1).split("/")[2]) {
                 case "Sentinels": {
-                    return {
+                    return addSentinel(inventory, typeName, premiumPurchase);
-                        InventoryChanges: addSentinel(inventory, typeName, premiumPurchase)
-                    };
                 }
                 case "Game": {
                     if (typeName.substr(1).split("/")[3] == "Projections") {
@@ -629,9 +577,7 @@ export const addItem = async (
                         addMiscItems(inventory, miscItemChanges);
                         inventory.HasOwnedVoidProjectionsPreviously = true;
                         return {
-                            InventoryChanges: {
                             MiscItems: miscItemChanges
-                            }
                         };
                     }
                     break;
@@ -639,27 +585,23 @@ export const addItem = async (
                 case "NeutralCreatures": {
                     const horseIndex = inventory.Horses.push({ ItemType: typeName });
                     return {
-                        InventoryChanges: {
                         Horses: [inventory.Horses[horseIndex - 1].toJSON<IEquipmentClient>()]
-                        }
                     };
                 }
                 case "Recipes": {
                     inventory.MiscItems.push({ ItemType: typeName, ItemCount: quantity });
                     return {
-                        InventoryChanges: {
                         MiscItems: [
                             {
                                 ItemType: typeName,
                                 ItemCount: quantity
                             }
                         ]
-                        }
                     };
                 }
                 case "Vehicles":
                     if (typeName == "/Lotus/Types/Vehicles/Motorcycle/MotorcyclePowerSuit") {
-                        return { InventoryChanges: addMotorcycle(inventory, typeName) };
+                        return addMotorcycle(inventory, typeName);
                     }
                     break;
             }
@@ -680,7 +622,7 @@ export const addItems = async (
         } else {
             inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount, true);
         }
-        combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
+        combineInventoryChanges(inventoryChanges, inventoryDelta);
     }
     return inventoryChanges;
 };
@@ -945,15 +887,6 @@ export const updateGeneric = async (data: IGenericUpdate, accountId: string): Pr
     };
 };
 
-export const updateTheme = async (data: IThemeUpdateRequest, accountId: string): Promise<void> => {
-    const inventory = await getInventory(accountId);
-    if (data.Style) inventory.ThemeStyle = data.Style;
-    if (data.Background) inventory.ThemeBackground = data.Background;
-    if (data.Sounds) inventory.ThemeSounds = data.Sounds;
-
-    await inventory.save();
-};
-
 export const addEquipment = (
     inventory: TInventoryDatabaseDocument,
     category: TEquipmentKey,
@@ -1388,12 +1321,11 @@ export const addKeyChainItems = async (
 
     const nonStoreItems = keyChainItems.map(item => fromStoreItem(item));
 
-    //TODO: inventoryChanges is not typed correctly
+    const inventoryChanges: IInventoryChanges = {};
-    const inventoryChanges = {};
 
     for (const item of nonStoreItems) {
         const inventoryChangesDelta = await addItem(inventory, item);
-        combineInventoryChanges(inventoryChanges, inventoryChangesDelta.InventoryChanges);
+        combineInventoryChanges(inventoryChanges, inventoryChangesDelta);
     }
 
     return inventoryChanges;

src/services/loginService.ts

@@ -69,36 +69,31 @@ export const getAccountForRequest = async (req: Request): Promise<TAccountDocume
     if (!req.query.accountId) {
         throw new Error("Request is missing accountId parameter");
     }
-    if (!req.query.nonce || parseInt(req.query.nonce as string) === 0) {
+    const nonce: number = parseInt(req.query.nonce as string);
+    if (!nonce) {
         throw new Error("Request is missing nonce parameter");
     }
+
     const account = await Account.findOne({
         _id: req.query.accountId,
-        Nonce: req.query.nonce
+        Nonce: nonce
     });
     if (!account) {
         throw new Error("Invalid accountId-nonce pair");
     }
+    if (account.Dropped && req.query.ct) {
+        account.Dropped = undefined;
+        await account.save();
+    }
     return account;
 };
 
 export const getAccountIdForRequest = async (req: Request): Promise<string> => {
-    const account = await getAccountForRequest(req);
+    return (await getAccountForRequest(req))._id.toString();
-    if (account.Dropped && req.query.ct) {
-        account.Dropped = undefined;
-        await account.save();
-    }
-    return account._id.toString();
 };
 
 export const isAdministrator = (account: TAccountDocument): boolean => {
-    if (!config.administratorNames) {
+    return !!config.administratorNames?.find(x => x == account.DisplayName);
-        return false;
-    }
-    if (typeof config.administratorNames == "string") {
-        return config.administratorNames == account.DisplayName;
-    }
-    return !!config.administratorNames.find(x => x == account.DisplayName);
 };
 
 const platform_magics = [753, 639, 247, 37, 60];

src/services/purchaseService.ts

@@ -333,7 +333,7 @@ export const handleStoreItemAcquisition = async (
         }
         switch (storeCategory) {
             default: {
-                purchaseResponse = await addItem(inventory, internalName, quantity, true);
+                purchaseResponse = { InventoryChanges: await addItem(inventory, internalName, quantity, true) };
                 break;
             }
             case "Types":
@@ -418,10 +418,7 @@ const handleBoosterPackPurchase = async (
     if (typeName == "/Lotus/Types/BoosterPacks/1999StickersPackEchoesArchimedeaFixed") {
         for (const result of pack.components) {
             purchaseResponse.BoosterPackItems += toStoreItem(result.Item) + ',{"lvl":0};';
-            combineInventoryChanges(
+            combineInventoryChanges(purchaseResponse.InventoryChanges, await addItem(inventory, result.Item, 1));
-                purchaseResponse.InventoryChanges,
-                (await addItem(inventory, result.Item, 1)).InventoryChanges
-            );
         }
     } else {
         for (let i = 0; i != quantity; ++i) {
@@ -432,7 +429,7 @@ const handleBoosterPackPurchase = async (
                     purchaseResponse.BoosterPackItems += toStoreItem(result.Item) + ',{"lvl":0};';
                     combineInventoryChanges(
                         purchaseResponse.InventoryChanges,
-                        (await addItem(inventory, result.Item, 1)).InventoryChanges
+                        await addItem(inventory, result.Item, 1)
                     );
                 }
             }
@@ -468,7 +465,7 @@ const handleTypesPurchase = async (
     logger.debug(`type category ${typeCategory}`);
     switch (typeCategory) {
         default:
-            return await addItem(inventory, typesName, quantity);
+            return { InventoryChanges: await addItem(inventory, typesName, quantity) };
         case "BoosterPacks":
             return handleBoosterPackPurchase(typesName, inventory, quantity);
         case "SlotItems":

src/types/requestTypes.ts

@@ -19,12 +19,6 @@ import {
     ICollectibleEntry
 } from "./inventoryTypes/inventoryTypes";
 
-export interface IThemeUpdateRequest {
-    Style?: string;
-    Background?: string;
-    Sounds?: string;
-}
-
 export interface IAffiliationChange {
     Tag: string;
     Standing: number;