chore: add custom getAccountInfo endpoint

This will help the IRC server get all the information it needs for permission management in a single request.

UPDATE AND START SERVER.bat

@@ -3,7 +3,6 @@
 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))
+            ...(await addItem(inventory, recipe.resultType, recipe.num, false)).InventoryChanges
         };
         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);
+        combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
     }
 
     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));
+        combineInventoryChanges(inventoryChanges, (await addItem(inventory, recipe.resultType)).InventoryChanges);
         await inventory.save();
         // Not a mistake: This response uses `inventoryChanges` instead of `InventoryChanges`.
         res.json({ inventoryChanges: inventoryChanges });

src/controllers/api/updateThemeController.ts

@@ -1,23 +1,25 @@
 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";
 
-export const updateThemeController: RequestHandler = async (request, response) => {
+const updateThemeController: RequestHandler = async (request, response) => {
     const accountId = await getAccountIdForRequest(request);
-    const data = getJSONfromString<IThemeUpdateRequest>(String(request.body));
+    const body = String(request.body);
 
-    const inventory = await getInventory(accountId, "ThemeStyle ThemeBackground ThemeSounds");
+    try {
-    if (data.Style) inventory.ThemeStyle = data.Style;
+        const json = getJSONfromString<IThemeUpdateRequest>(body);
-    if (data.Background) inventory.ThemeBackground = data.Background;
+        if (typeof json !== "object") {
-    if (data.Sounds) inventory.ThemeSounds = data.Sounds;
+            throw new Error("Invalid data format");
-    await inventory.save();
+        }
+
+        await updateTheme(json, accountId);
+    } catch (err) {
+        console.error("Error parsing JSON data:", err);
+    }
 
     response.json({});
 };
 
-interface IThemeUpdateRequest {
+export { updateThemeController };
-    Style?: string;
-    Background?: string;
-    Sounds?: string;
-}

src/controllers/custom/getAccountInfoController.ts

@@ -0,0 +1,27 @@
+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,24 +1,9 @@
-import { Account } from "@/src/models/loginModel";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
 export const ircDroppedController: RequestHandler = async (req, res) => {
-    if (!req.query.accountId) {
+    const account = await getAccountForRequest(req);
-        throw new Error("Request is missing accountId parameter");
+    account.Dropped = true;
-    }
+    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,6 +1,5 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest, isAdministrator, isNameTaken } from "@/src/services/loginService";
+import { getAccountForRequest, isNameTaken } from "@/src/services/loginService";
-import { config, saveConfig } from "@/src/services/configService";
 
 export const renameAccountController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
@@ -8,18 +7,8 @@ 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,13 +19,9 @@ import mongoose from "mongoose";
         return "<BIGINT>" + this.toString() + "</BIGINT>";
     };
     const og_stringify = JSON.stringify;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-    JSON.stringify = (obj: any, replacer?: any, space?: string | number): string => {
+    (JSON as any).stringify = (obj: any): string => {
-        return og_stringify(obj, replacer as string[], space)
+        return og_stringify(obj).split(`"<BIGINT>`).join(``).split(`</BIGINT>"`).join(``);
-            .split(`"<BIGINT>`)
-            .join(``)
-            .split(`</BIGINT>"`)
-            .join(``);
     };
 }
 

src/routes/custom.ts

@@ -6,6 +6,7 @@ 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";
@@ -29,6 +30,7 @@ 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[];
+    administratorNames?: string[] | string;
     autoCreateAccount?: boolean;
     skipTutorial?: boolean;
     skipAllDialogue?: boolean;
@@ -83,15 +83,10 @@ 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.info(`Updating config.json to make administratorNames an array.`);
+        logger.warn(
-        config.administratorNames = [config.administratorNames];
+            `"administratorNames" should be an array; please add square brackets: ["${config.administratorNames}"]`
-        void saveConfig();
+        );
     }
 };

src/services/inventoryService.ts

@@ -29,7 +29,11 @@ import {
     ICrewShipWeaponClient
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
-import { IMissionInventoryUpdateRequest, IUpdateChallengeProgressRequest } from "../types/requestTypes";
+import {
+    IMissionInventoryUpdateRequest,
+    IThemeUpdateRequest,
+    IUpdateChallengeProgressRequest
+} from "../types/requestTypes";
 import { logger } from "@/src/utils/logger";
 import { convertInboxMessage, fromStoreItem, getExalted, getKeyChainItems } from "@/src/services/itemDataService";
 import {
@@ -230,10 +234,10 @@ export const addItem = async (
     typeName: string,
     quantity: number = 1,
     premiumPurchase: boolean = false
-): Promise<IInventoryChanges> => {
+): Promise<{ InventoryChanges: 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 await handleBundleAcqusition(typeName, inventory, quantity);
+        return { InventoryChanges: await handleBundleAcqusition(typeName, inventory, quantity) };
     }
 
     // Strict typing
@@ -246,7 +250,9 @@ export const addItem = async (
         ];
         addRecipes(inventory, recipeChanges);
         return {
-            Recipes: recipeChanges
+            InventoryChanges: {
+                Recipes: recipeChanges
+            }
         };
     }
     if (typeName in ExportResources) {
@@ -259,7 +265,9 @@ export const addItem = async (
             ];
             addMiscItems(inventory, miscItemChanges);
             return {
-                MiscItems: miscItemChanges
+                InventoryChanges: {
+                    MiscItems: miscItemChanges
+                }
             };
         } else if (ExportResources[typeName].productCategory == "FusionTreasures") {
             const fusionTreasureChanges = [
@@ -271,21 +279,25 @@ export const addItem = async (
             ];
             addFusionTreasures(inventory, fusionTreasureChanges);
             return {
-                FusionTreasures: fusionTreasureChanges
+                InventoryChanges: {
+                    FusionTreasures: fusionTreasureChanges
+                }
             };
         } else if (ExportResources[typeName].productCategory == "Ships") {
             const oid = await createShip(inventory.accountOwnerId, typeName);
             inventory.Ships.push(oid);
             return {
-                Ships: [
+                InventoryChanges: {
-                    {
+                    Ships: [
-                        ItemId: { $oid: oid.toString() },
+                        {
-                        ItemType: typeName
+                            ItemId: { $oid: oid.toString() },
-                    }
+                            ItemType: typeName
-                ]
+                        }
+                    ]
+                }
             };
         } else if (ExportResources[typeName].productCategory == "CrewShips") {
-            return {
+            const inventoryChanges = {
                 ...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
@@ -293,6 +305,8 @@ export const addItem = async (
                     ? addCrewShipHarness(inventory, "/Lotus/Types/Game/CrewShip/RailJack/DefaultHarness")
                     : {})
             };
+
+            return { InventoryChanges: inventoryChanges };
         } else if (ExportResources[typeName].productCategory == "ShipDecorations") {
             const changes = [
                 {
@@ -302,7 +316,9 @@ export const addItem = async (
             ];
             addShipDecorations(inventory, changes);
             return {
-                ShipDecorations: changes
+                InventoryChanges: {
+                    ShipDecorations: changes
+                }
             };
         } else if (ExportResources[typeName].productCategory == "KubrowPetEggs") {
             const changes: IKubrowPetEggClient[] = [];
@@ -323,7 +339,9 @@ export const addItem = async (
                 });
             }
             return {
-                KubrowPetEggs: changes
+                InventoryChanges: {
+                    KubrowPetEggs: changes
+                }
             };
         } else {
             throw new Error(`unknown product category: ${ExportResources[typeName].productCategory}`);
@@ -331,13 +349,14 @@ export const addItem = async (
     }
     if (typeName in ExportCustoms) {
         if (ExportCustoms[typeName].productCategory == "CrewShipWeaponSkins") {
-            return addCrewShipWeaponSkin(inventory, typeName);
+            return { InventoryChanges: addCrewShipWeaponSkin(inventory, typeName) };
         } else {
-            return addSkin(inventory, typeName);
+            return { InventoryChanges: addSkin(inventory, typeName) };
         }
     }
     if (typeName in ExportFlavour) {
-        return addCustomization(inventory, typeName);
+        const inventoryChanges = addCustomization(inventory, typeName);
+        return { InventoryChanges: inventoryChanges };
     }
     if (typeName in ExportUpgrades || typeName in ExportArcanes) {
         const changes = [
@@ -348,7 +367,9 @@ export const addItem = async (
         ];
         addMods(inventory, changes);
         return {
-            RawUpgrades: changes
+            InventoryChanges: {
+                RawUpgrades: changes
+            }
         };
     }
     if (typeName in ExportGear) {
@@ -360,7 +381,9 @@ export const addItem = async (
         ];
         addConsumables(inventory, consumablesChanges);
         return {
-            Consumables: consumablesChanges
+            InventoryChanges: {
+                Consumables: consumablesChanges
+            }
         };
     }
     if (typeName in ExportWeapons) {
@@ -403,12 +426,14 @@ export const addItem = async (
             );
             if (weapon.additionalItems) {
                 for (const item of weapon.additionalItems) {
-                    combineInventoryChanges(inventoryChanges, await addItem(inventory, item, 1));
+                    combineInventoryChanges(inventoryChanges, (await addItem(inventory, item, 1)).InventoryChanges);
                 }
             }
             return {
-                ...inventoryChanges,
+                InventoryChanges: {
-                ...occupySlot(inventory, InventorySlot.WEAPONS, premiumPurchase)
+                    ...inventoryChanges,
+                    ...occupySlot(inventory, InventorySlot.WEAPONS, premiumPurchase)
+                }
             };
         } else {
             // Modular weapon parts
@@ -420,28 +445,36 @@ export const addItem = async (
             ];
             addMiscItems(inventory, miscItemChanges);
             return {
-                MiscItems: miscItemChanges
+                InventoryChanges: {
+                    MiscItems: miscItemChanges
+                }
             };
         }
     }
     if (typeName in ExportRailjackWeapons) {
         return {
-            ...addCrewShipWeapon(inventory, typeName),
+            InventoryChanges: {
-            ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, premiumPurchase)
+                ...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 {
-            RegularCredits: creditsTotal
+            InventoryChanges: {
+                RegularCredits: creditsTotal
+            }
         };
     }
     if (typeName in ExportFusionBundles) {
         const fusionPointsTotal = ExportFusionBundles[typeName].fusionPoints * quantity;
         inventory.FusionPoints += fusionPointsTotal;
         return {
-            FusionPoints: fusionPointsTotal
+            InventoryChanges: {
+                FusionPoints: fusionPointsTotal
+            }
         };
     }
     if (typeName in ExportKeys) {
@@ -450,8 +483,8 @@ export const addItem = async (
 
         if (key.chainStages) {
             const key = addQuestKey(inventory, { ItemType: typeName });
-            if (!key) return {};
+            if (!key) return { InventoryChanges: {} };
-            return { QuestKeys: [key] };
+            return { InventoryChanges: { QuestKeys: [key] } };
         } else {
             const key = { ItemType: typeName, ItemCount: quantity };
 
@@ -461,14 +494,19 @@ export const addItem = async (
             } else {
                 inventory.LevelKeys.push(key);
             }
-            return { LevelKeys: [key] };
+            return { InventoryChanges: { LevelKeys: [key] } };
         }
     }
     if (typeName in ExportDrones) {
-        return addDrone(inventory, typeName);
+        const inventoryChanges = addDrone(inventory, typeName);
+        return {
+            InventoryChanges: inventoryChanges
+        };
     }
     if (typeName in ExportEmailItems) {
-        return await addEmailItem(inventory, typeName);
+        return {
+            InventoryChanges: await addEmailItem(inventory, typeName)
+        };
     }
 
     // Path-based duck typing
@@ -477,36 +515,42 @@ export const addItem = async (
             switch (typeName.substr(1).split("/")[2]) {
                 default: {
                     return {
-                        ...addPowerSuit(
+                        InventoryChanges: {
-                            inventory,
+                            ...addPowerSuit(
-                            typeName,
+                                inventory,
-                            {},
+                                typeName,
-                            premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
+                                {},
-                        ),
+                                premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
-                        ...occupySlot(inventory, InventorySlot.SUITS, premiumPurchase)
+                            ),
+                            ...occupySlot(inventory, InventorySlot.SUITS, premiumPurchase)
+                        }
                     };
                 }
                 case "Archwing": {
                     inventory.ArchwingEnabled = true;
                     return {
-                        ...addSpaceSuit(
+                        InventoryChanges: {
-                            inventory,
+                            ...addSpaceSuit(
-                            typeName,
+                                inventory,
-                            {},
+                                typeName,
-                            premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
+                                {},
-                        ),
+                                premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
-                        ...occupySlot(inventory, InventorySlot.SPACESUITS, premiumPurchase)
+                            ),
+                            ...occupySlot(inventory, InventorySlot.SPACESUITS, premiumPurchase)
+                        }
                     };
                 }
                 case "EntratiMech": {
                     return {
-                        ...addMechSuit(
+                        InventoryChanges: {
-                            inventory,
+                            ...addMechSuit(
-                            typeName,
+                                inventory,
-                            {},
+                                typeName,
-                            premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
+                                {},
-                        ),
+                                premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
-                        ...occupySlot(inventory, InventorySlot.MECHSUITS, premiumPurchase)
+                            ),
+                            ...occupySlot(inventory, InventorySlot.MECHSUITS, premiumPurchase)
+                        }
                     };
                 }
             }
@@ -524,7 +568,9 @@ export const addItem = async (
                         ];
                         addMods(inventory, changes);
                         return {
-                            RawUpgrades: changes
+                            InventoryChanges: {
+                                RawUpgrades: changes
+                            }
                         };
                     }
                     break;
@@ -541,7 +587,9 @@ export const addItem = async (
                             ];
                             addMiscItems(inventory, miscItemChanges);
                             return {
-                                MiscItems: miscItemChanges
+                                InventoryChanges: {
+                                    MiscItems: miscItemChanges
+                                }
                             };
                         } else {
                             const changes = [
@@ -552,7 +600,9 @@ export const addItem = async (
                             ];
                             addMods(inventory, changes);
                             return {
-                                RawUpgrades: changes
+                                InventoryChanges: {
+                                    RawUpgrades: changes
+                                }
                             };
                         }
                     }
@@ -563,7 +613,9 @@ export const addItem = async (
         case "Types":
             switch (typeName.substr(1).split("/")[2]) {
                 case "Sentinels": {
-                    return addSentinel(inventory, typeName, premiumPurchase);
+                    return {
+                        InventoryChanges: addSentinel(inventory, typeName, premiumPurchase)
+                    };
                 }
                 case "Game": {
                     if (typeName.substr(1).split("/")[3] == "Projections") {
@@ -577,7 +629,9 @@ export const addItem = async (
                         addMiscItems(inventory, miscItemChanges);
                         inventory.HasOwnedVoidProjectionsPreviously = true;
                         return {
-                            MiscItems: miscItemChanges
+                            InventoryChanges: {
+                                MiscItems: miscItemChanges
+                            }
                         };
                     }
                     break;
@@ -585,23 +639,27 @@ export const addItem = async (
                 case "NeutralCreatures": {
                     const horseIndex = inventory.Horses.push({ ItemType: typeName });
                     return {
-                        Horses: [inventory.Horses[horseIndex - 1].toJSON<IEquipmentClient>()]
+                        InventoryChanges: {
+                            Horses: [inventory.Horses[horseIndex - 1].toJSON<IEquipmentClient>()]
+                        }
                     };
                 }
                 case "Recipes": {
                     inventory.MiscItems.push({ ItemType: typeName, ItemCount: quantity });
                     return {
-                        MiscItems: [
+                        InventoryChanges: {
-                            {
+                            MiscItems: [
-                                ItemType: typeName,
+                                {
-                                ItemCount: quantity
+                                    ItemType: typeName,
-                            }
+                                    ItemCount: quantity
-                        ]
+                                }
+                            ]
+                        }
                     };
                 }
                 case "Vehicles":
                     if (typeName == "/Lotus/Types/Vehicles/Motorcycle/MotorcyclePowerSuit") {
-                        return addMotorcycle(inventory, typeName);
+                        return { InventoryChanges: addMotorcycle(inventory, typeName) };
                     }
                     break;
             }
@@ -622,7 +680,7 @@ export const addItems = async (
         } else {
             inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount, true);
         }
-        combineInventoryChanges(inventoryChanges, inventoryDelta);
+        combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
     }
     return inventoryChanges;
 };
@@ -887,6 +945,15 @@ 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,
@@ -1321,11 +1388,12 @@ export const addKeyChainItems = async (
 
     const nonStoreItems = keyChainItems.map(item => fromStoreItem(item));
 
-    const inventoryChanges: IInventoryChanges = {};
+    //TODO: inventoryChanges is not typed correctly
+    const inventoryChanges = {};
 
     for (const item of nonStoreItems) {
         const inventoryChangesDelta = await addItem(inventory, item);
-        combineInventoryChanges(inventoryChanges, inventoryChangesDelta);
+        combineInventoryChanges(inventoryChanges, inventoryChangesDelta.InventoryChanges);
     }
 
     return inventoryChanges;

src/services/loginService.ts

@@ -69,31 +69,36 @@ export const getAccountForRequest = async (req: Request): Promise<TAccountDocume
     if (!req.query.accountId) {
         throw new Error("Request is missing accountId parameter");
     }
-    const nonce: number = parseInt(req.query.nonce as string);
+    if (!req.query.nonce || parseInt(req.query.nonce as string) === 0) {
-    if (!nonce) {
         throw new Error("Request is missing nonce parameter");
     }
-
     const account = await Account.findOne({
         _id: req.query.accountId,
-        Nonce: nonce
+        Nonce: req.query.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> => {
-    return (await getAccountForRequest(req))._id.toString();
+    const account = await getAccountForRequest(req);
+    if (account.Dropped && req.query.ct) {
+        account.Dropped = undefined;
+        await account.save();
+    }
+    return account._id.toString();
 };
 
 export const isAdministrator = (account: TAccountDocument): boolean => {
-    return !!config.administratorNames?.find(x => x == account.DisplayName);
+    if (!config.administratorNames) {
+        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 = { InventoryChanges: await addItem(inventory, internalName, quantity, true) };
+                purchaseResponse = await addItem(inventory, internalName, quantity, true);
                 break;
             }
             case "Types":
@@ -418,7 +418,10 @@ const handleBoosterPackPurchase = async (
     if (typeName == "/Lotus/Types/BoosterPacks/1999StickersPackEchoesArchimedeaFixed") {
         for (const result of pack.components) {
             purchaseResponse.BoosterPackItems += toStoreItem(result.Item) + ',{"lvl":0};';
-            combineInventoryChanges(purchaseResponse.InventoryChanges, await addItem(inventory, result.Item, 1));
+            combineInventoryChanges(
+                purchaseResponse.InventoryChanges,
+                (await addItem(inventory, result.Item, 1)).InventoryChanges
+            );
         }
     } else {
         for (let i = 0; i != quantity; ++i) {
@@ -429,7 +432,7 @@ const handleBoosterPackPurchase = async (
                     purchaseResponse.BoosterPackItems += toStoreItem(result.Item) + ',{"lvl":0};';
                     combineInventoryChanges(
                         purchaseResponse.InventoryChanges,
-                        await addItem(inventory, result.Item, 1)
+                        (await addItem(inventory, result.Item, 1)).InventoryChanges
                     );
                 }
             }
@@ -465,7 +468,7 @@ const handleTypesPurchase = async (
     logger.debug(`type category ${typeCategory}`);
     switch (typeCategory) {
         default:
-            return { InventoryChanges: await addItem(inventory, typesName, quantity) };
+            return await addItem(inventory, typesName, quantity);
         case "BoosterPacks":
             return handleBoosterPackPurchase(typesName, inventory, quantity);
         case "SlotItems":

src/types/requestTypes.ts

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