this should not have been removed

Reviewed-on: OpenWF/SpaceNinjaServer#1796
Co-authored-by: Jānis <janisslsm@noreply.localhost>
Co-committed-by: Jānis <janisslsm@noreply.localhost>

.github/workflows/build.yml

@@ -10,8 +10,6 @@ jobs:
               uses: actions/checkout@v4.1.2
             - name: Setup Node.js environment
               uses: actions/setup-node@v4.0.2
-              with:
-                  node-version: ">=20.6.0"
             - run: npm ci
             - run: cp config.json.example config.json
             - run: npm run verify

Dockerfile

@@ -5,44 +5,17 @@ ENV APP_MY_ADDRESS=localhost
 ENV APP_HTTP_PORT=80
 ENV APP_HTTPS_PORT=443
 ENV APP_AUTO_CREATE_ACCOUNT=true
-ENV APP_SKIP_TUTORIAL=false
-ENV APP_SKIP_ALL_DIALOGUE=false
-ENV APP_UNLOCK_ALL_SCANS=false
-ENV APP_UNLOCK_ALL_MISSIONS=false
-ENV APP_INFINITE_CREDITS=false
-ENV APP_INFINITE_PLATINUM=false
-ENV APP_INFINITE_ENDO=false
-ENV APP_INFINITE_REGAL_AYA=false
-ENV APP_INFINITE_HELMINTH_MATERIALS=false
-ENV APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS=false
-ENV APP_DONT_SUBTRACT_VOIDTRACES=false
-ENV APP_DONT_SUBTRACT_CONSUMABLES=false
-ENV APP_UNLOCK_ALL_SHIP_FEATURES=false
-ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=false
-ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=false
-ENV APP_UNLOCK_ALL_SKINS=false
-ENV APP_UNLOCK_ALL_CAPTURA_SCENES=false
-ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=false
-ENV APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE=false
-ENV APP_UNLOCK_EXILUS_EVERYWHERE=false
-ENV APP_UNLOCK_ARCANES_EVERYWHERE=false
-ENV APP_NO_DAILY_FOCUS_LIMIT=false
-ENV APP_NO_ARGON_CRYSTAL_DECAY=false
-ENV APP_NO_MASTERY_RANK_UP_COOLDOWN=false
-ENV APP_NO_VENDOR_PURCHASE_LIMITS=true
-ENV APP_NO_DEATH_MARKS=false
-ENV APP_NO_KIM_COOLDOWNS=false
-ENV APP_SYNDICATE_MISSIONS_REPEATABLE=false
-ENV APP_INSTANT_FINISH_RIVEN_CHALLENGE=false
-ENV APP_INSTANT_RESOURCE_EXTRACTOR_DRONES=false
-ENV APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE=false
-ENV APP_SKIP_CLAN_KEY_CRAFTING=false
-ENV APP_NO_DOJO_ROOM_BUILD_STAGE=false
-ENV APP_NO_DECO_BUILD_STAGE=false
-ENV APP_FAST_DOJO_ROOM_DESTRUCTION=false
-ENV APP_NO_DOJO_RESEARCH_COSTS=false
-ENV APP_NO_DOJO_RESEARCH_TIME=false
-ENV APP_FAST_CLAN_ASCENSION=false
+ENV APP_SKIP_STORY_MODE_CHOICE=true
+ENV APP_SKIP_TUTORIAL=true
+ENV APP_SKIP_ALL_DIALOGUE=true
+ENV APP_UNLOCK_ALL_SCANS=true
+ENV APP_UNLOCK_ALL_MISSIONS=true
+ENV APP_INFINITE_RESOURCES=true
+ENV APP_UNLOCK_ALL_SHIP_FEATURES=true
+ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=true
+ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=true
+ENV APP_UNLOCK_ALL_SKINS=true
+ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=true
 ENV APP_SPOOF_MASTERY_RANK=-1
 
 RUN apk add --no-cache bash sed wget jq

README.md

@@ -14,22 +14,4 @@ SpaceNinjaServer requires a `config.json`. To set it up, you can copy the [confi
 
 - `logger.level` can be `fatal`, `error`, `warn`, `info`, `http`, `debug`, or `trace`.
 - `myIrcAddresses` can be used to point to an IRC server. If not provided, defaults to `[ myAddress ]`.
-- `worldState.eidolonOverride` can be set to `day` or `night` to lock the time to day/fass and night/vome on Plains of Eidolon/Cambion Drift.
-- `worldState.vallisOverride` can be set to `warm` or `cold` to lock the temperature on Orb Vallis.
-- `worldState.nightwaveOverride` will lock the nightwave season, assuming the client is new enough for it. Valid values:
-  - `RadioLegionIntermission13Syndicate` for Nora's Mix Vol. 9
-  - `RadioLegionIntermission12Syndicate` for Nora's Mix Vol. 8
-  - `RadioLegionIntermission11Syndicate` for Nora's Mix Vol. 7
-  - `RadioLegionIntermission10Syndicate` for Nora's Mix Vol. 6
-  - `RadioLegionIntermission9Syndicate` for Nora's Mix Vol. 5
-  - `RadioLegionIntermission8Syndicate` for Nora's Mix Vol. 4
-  - `RadioLegionIntermission7Syndicate` for Nora's Mix Vol. 3
-  - `RadioLegionIntermission6Syndicate` for Nora's Mix Vol. 2
-  - `RadioLegionIntermission5Syndicate` for Nora's Mix Vol. 1
-  - `RadioLegionIntermission4Syndicate` for Nora's Choice
-  - `RadioLegionIntermission3Syndicate` for Intermission III
-  - `RadioLegion3Syndicate` for Glassmaker
-  - `RadioLegionIntermission2Syndicate` for Intermission II
-  - `RadioLegion2Syndicate` for The Emissary
-  - `RadioLegionIntermissionSyndicate` for Intermission I
-  - `RadioLegionSyndicate` for The Wolf of Saturn Six
+- `worldState.lockTime` will lock the time provided in worldState if nonzero, e.g. `1743202800` for night in POE.

UPDATE AND START SERVER.bat

@@ -1,9 +1,10 @@
 @echo off
 
 echo Updating SpaceNinjaServer...
+git config remote.origin.url https://openwf.io/SpaceNinjaServer.git
 git fetch --prune
 git stash
-git checkout -f origin/main
+git reset --hard origin/main
 
 if exist static\data\0\ (
 	echo Updating stripped assets...

UPDATE AND START SERVER.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-echo "Updating SpaceNinjaServer..."
-git fetch --prune
-git stash
-git checkout -f origin/main
-
-if [ -d "static/data/0/" ]; then
-    echo "Updating stripped assets..."
-    cd static/data/0/
-    git pull
-    cd ../../../
-fi
-
-echo "Updating dependencies..."
-npm i --omit=dev
-
-npm run build
-if [ $? -eq 0 ]; then
-    npm run start
-    echo "SpaceNinjaServer seems to have crashed."
-fi
-

config.json.example

@@ -19,9 +19,6 @@
   "infiniteEndo": false,
   "infiniteRegalAya": false,
   "infiniteHelminthMaterials": false,
-  "claimingBlueprintRefundsIngredients": false,
-  "dontSubtractVoidTraces": false,
-  "dontSubtractConsumables": false,
   "unlockAllShipFeatures": false,
   "unlockAllShipDecorations": false,
   "unlockAllFlavourItems": false,
@@ -38,11 +35,8 @@
   "noVendorPurchaseLimits": true,
   "noDeathMarks": false,
   "noKimCooldowns": false,
-  "syndicateMissionsRepeatable": false,
-  "instantFinishRivenChallenge": false,
   "instantResourceExtractorDrones": false,
   "noResourceExtractorDronesDamage": false,
-  "skipClanKeyCrafting": false,
   "noDojoRoomBuildStage": false,
   "noDecoBuildStage": false,
   "fastDojoRoomDestruction": false,
@@ -50,17 +44,11 @@
   "noDojoResearchTime": false,
   "fastClanAscension": false,
   "spoofMasteryRank": -1,
-  "nightwaveStandingMultiplier": 1,
   "worldState": {
     "creditBoost": false,
     "affinityBoost": false,
     "resourceBoost": false,
     "starDays": true,
-    "eidolonOverride": "",
-    "vallisOverride": "",
-    "nightwaveOverride": ""
-  },
-  "dev": {
-    "keepVendorsExpired": false
+    "lockTime": 0
   }
 }

docker-compose.yml

@@ -12,44 +12,19 @@ services:
             # APP_HTTP_PORT: 80
             # APP_HTTPS_PORT: 443
             # APP_AUTO_CREATE_ACCOUNT: true
-            # APP_SKIP_TUTORIAL: false
-            # APP_SKIP_ALL_DIALOGUE: false
-            # APP_UNLOCK_ALL_SCANS: false
-            # APP_UNLOCK_ALL_MISSIONS: false
-            # APP_INFINITE_CREDITS: false
-            # APP_INFINITE_PLATINUM: false
-            # APP_INFINITE_ENDO: false
-            # APP_INFINITE_REGAL_AYA: false
-            # APP_INFINITE_HELMINTH_MATERIALS: false
-            # APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS: false
-            # APP_DONT_SUBTRACT_VOIDTRACES: false
-            # APP_DONT_SUBTRACT_CONSUMABLES: false
-            # APP_UNLOCK_ALL_SHIP_FEATURES: false
-            # APP_UNLOCK_ALL_SHIP_DECORATIONS: false
-            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: false
-            # APP_UNLOCK_ALL_SKINS: false
-            # APP_UNLOCK_ALL_CAPTURA_SCENES: false
-            # APP_UNIVERSAL_POLARITY_EVERYWHERE: false
-            # APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE: false
-            # APP_UNLOCK_EXILUS_EVERYWHERE: false
-            # APP_UNLOCK_ARCANES_EVERYWHERE: false
-            # APP_NO_DAILY_FOCUS_LIMIT: false
-            # APP_NO_ARGON_CRYSTAL_DECAY: false
-            # APP_NO_MASTERY_RANK_UP_COOLDOWN: false
-            # APP_NO_VENDOR_PURCHASE_LIMITS: true
-            # APP_NO_DEATH_MARKS: false
-            # APP_NO_KIM_COOLDOWNS: false
-            # APP_SYNDICATE_MISSIONS_REPEATABLE: false
-            # APP_INSTANT_FINISH_RIVEN_CHALLENGE: false
-            # APP_INSTANT_RESOURCE_EXTRACTOR_DRONES: false
-            # APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE: false
-            # APP_SKIP_CLAN_KEY_CRAFTING: false
-            # APP_NO_DOJO_ROOM_BUILD_STAGE: false
-            # APP_NO_DECO_BUILD_STAGE: false
-            # APP_FAST_DOJO_ROOM_DESTRUCTION: false
-            # APP_NO_DOJO_RESEARCH_COSTS: false
-            # APP_NO_DOJO_RESEARCH_TIME: false
-            # APP_FAST_CLAN_ASCENSION: false
+            # APP_SKIP_STORY_MODE_CHOICE: true
+            # APP_SKIP_TUTORIAL: true
+            # APP_SKIP_ALL_DIALOGUE: true
+            # APP_UNLOCK_ALL_SCANS: true
+            # APP_UNLOCK_ALL_MISSIONS: true
+            # APP_UNLOCK_ALL_QUESTS: true
+            # APP_COMPLETE_ALL_QUESTS: true
+            # APP_INFINITE_RESOURCES: true
+            # APP_UNLOCK_ALL_SHIP_FEATURES: true
+            # APP_UNLOCK_ALL_SHIP_DECORATIONS: true
+            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: true
+            # APP_UNLOCK_ALL_SKINS: true
+            # APP_UNIVERSAL_POLARITY_EVERYWHERE: true
             # APP_SPOOF_MASTERY_RANK: -1
         volumes:
             - ./docker-data/static:/app/static/data

docker-entrypoint.sh

@@ -19,6 +19,5 @@ do
   mv config.tmp config.json
 done
 
-npm i --omit=dev
-npm run build
-exec npm run start
+npm install
+exec npm run dev

package.json

@@ -20,24 +20,28 @@
     "@types/morgan": "^1.9.9",
     "crc-32": "^1.2.2",
     "express": "^5",
-    "json-with-bigint": "^3.4.4",
+    "json-with-bigint": "^3.2.2",
     "mongoose": "^8.11.0",
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": "^5.5",
-    "warframe-public-export-plus": "^0.5.66",
+    "warframe-public-export-plus": "^0.5.57",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"
   },
   "devDependencies": {
+    "@rxliuli/tsgo": "^2025.3.31",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
-    "@typescript/native-preview": "^7.0.0-dev.20250523.1",
     "eslint": "^8",
     "eslint-plugin-prettier": "^5.2.5",
     "prettier": "^3.5.3",
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.2.0"
+  },
+  "engines": {
+    "node": ">=18.15.0",
+    "npm": ">=9.5.0"
   }
 }

src/app.ts

@@ -21,13 +21,6 @@ app.use((req, _res, next) => {
     if (req.headers["content-encoding"] == "ezip" || req.headers["content-encoding"] == "e") {
         req.headers["content-encoding"] = undefined;
     }
-
-    // U18 uses application/x-www-form-urlencoded even tho the data is JSON which Express doesn't like.
-    // U17 sets no Content-Type at all, which Express also doesn't like.
-    if (!req.headers["content-type"] || req.headers["content-type"] == "application/x-www-form-urlencoded") {
-        req.headers["content-type"] = "application/octet-stream";
-    }
-
     next();
 });
 

src/constants/timeConstants.ts

@@ -2,18 +2,15 @@ const millisecondsPerSecond = 1000;
 const secondsPerMinute = 60;
 const minutesPerHour = 60;
 const hoursPerDay = 24;
-const daysPerWeek = 7;
 
 const unixSecond = millisecondsPerSecond;
 const unixMinute = secondsPerMinute * millisecondsPerSecond;
 const unixHour = unixMinute * minutesPerHour;
 const unixDay = hoursPerDay * unixHour;
-const unixWeek = daysPerWeek * unixDay;
 
 export const unixTimesInMs = {
     second: unixSecond,
     minute: unixMinute,
     hour: unixHour,
-    day: unixDay,
-    week: unixWeek
+    day: unixDay
 };

src/controllers/api/activateRandomModController.ts

@@ -1,16 +1,11 @@
 import { toOid } from "@/src/helpers/inventoryHelpers";
-import {
-    createVeiledRivenFingerprint,
-    createUnveiledRivenFingerprint,
-    rivenRawToRealWeighted
-} from "@/src/helpers/rivenHelper";
+import { createVeiledRivenFingerprint, rivenRawToRealWeighted } from "@/src/helpers/rivenHelper";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { addMods, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getRandomElement } from "@/src/services/rngService";
 import { RequestHandler } from "express";
 import { ExportUpgrades } from "warframe-public-export-plus";
-import { config } from "@/src/services/configService";
 
 export const activateRandomModController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -22,10 +17,8 @@ export const activateRandomModController: RequestHandler = async (req, res) => {
             ItemCount: -1
         }
     ]);
-    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType])!;
-    const fingerprint = config.instantFinishRivenChallenge
-        ? createUnveiledRivenFingerprint(ExportUpgrades[rivenType])
-        : createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
+    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType]);
+    const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
     const upgradeIndex =
         inventory.Upgrades.push({
             ItemType: rivenType,

src/controllers/api/addFriendController.ts

@@ -1,60 +0,0 @@
-import { toOid } from "@/src/helpers/inventoryHelpers";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { Friendship } from "@/src/models/friendModel";
-import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "@/src/services/friendService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/friendTypes";
-import { RequestHandler } from "express";
-
-export const addFriendController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const payload = getJSONfromString<IAddFriendRequest>(String(req.body));
-    const promises: Promise<void>[] = [];
-    const newFriends: IFriendInfo[] = [];
-    if (payload.friend == "all") {
-        const [internalFriendships, externalFriendships] = await Promise.all([
-            Friendship.find({ owner: accountId }, "friend"),
-            Friendship.find({ friend: accountId }, "owner")
-        ]);
-        for (const externalFriendship of externalFriendships) {
-            if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
-                promises.push(
-                    Friendship.insertOne({
-                        owner: accountId,
-                        friend: externalFriendship.owner,
-                        Note: externalFriendship.Note // TOVERIFY: Should the note be copied when accepting a friend request?
-                    }) as unknown as Promise<void>
-                );
-                newFriends.push({
-                    _id: toOid(externalFriendship.owner)
-                });
-            }
-        }
-    } else {
-        const externalFriendship = await Friendship.findOne({ owner: payload.friend, friend: accountId }, "Note");
-        if (externalFriendship) {
-            promises.push(
-                Friendship.insertOne({
-                    owner: accountId,
-                    friend: payload.friend,
-                    Note: externalFriendship.Note
-                }) as unknown as Promise<void>
-            );
-            newFriends.push({
-                _id: { $oid: payload.friend }
-            });
-        }
-    }
-    for (const newFriend of newFriends) {
-        promises.push(addAccountDataToFriendInfo(newFriend));
-        promises.push(addInventoryDataToFriendInfo(newFriend));
-    }
-    await Promise.all(promises);
-    res.json({
-        Friends: newFriends
-    });
-};
-
-interface IAddFriendRequest {
-    friend: string; // oid or "all" in which case all=1 is also a query parameter
-}

src/controllers/api/addIgnoredUserController.ts

@@ -2,7 +2,7 @@ import { toOid } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Account, Ignore } from "@/src/models/loginModel";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/friendTypes";
+import { IFriendInfo } from "@/src/types/guildTypes";
 import { RequestHandler } from "express";
 
 export const addIgnoredUserController: RequestHandler = async (req, res) => {

src/controllers/api/addPendingFriendController.ts

@@ -1,52 +0,0 @@
-import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { Friendship } from "@/src/models/friendModel";
-import { Account } from "@/src/models/loginModel";
-import { addInventoryDataToFriendInfo, areFriendsOfFriends } from "@/src/services/friendService";
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/friendTypes";
-import { RequestHandler } from "express";
-
-export const addPendingFriendController: RequestHandler = async (req, res) => {
-    const payload = getJSONfromString<IAddPendingFriendRequest>(String(req.body));
-
-    const account = await Account.findOne({ DisplayName: payload.friend });
-    if (!account) {
-        res.status(400).end();
-        return;
-    }
-
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(account._id.toString(), "Settings");
-    if (
-        inventory.Settings?.FriendInvRestriction == "GIFT_MODE_NONE" ||
-        (inventory.Settings?.FriendInvRestriction == "GIFT_MODE_FRIENDS" &&
-            !(await areFriendsOfFriends(account._id, accountId)))
-    ) {
-        res.status(400).send("Friend Invite Restriction");
-        return;
-    }
-
-    await Friendship.insertOne({
-        owner: accountId,
-        friend: account._id,
-        Note: payload.message
-    });
-
-    const friendInfo: IFriendInfo = {
-        _id: toOid(account._id),
-        DisplayName: account.DisplayName,
-        LastLogin: toMongoDate(account.LastLogin),
-        Note: payload.message
-    };
-    await addInventoryDataToFriendInfo(friendInfo);
-    res.json({
-        Friend: friendInfo
-    });
-};
-
-interface IAddPendingFriendRequest {
-    friend: string;
-    message: string;
-}

src/controllers/api/addToAllianceController.ts

@@ -1,7 +1,7 @@
 import { getJSONfromString, regexEscape } from "@/src/helpers/stringHelpers";
 import { Alliance, AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
 import { createMessage } from "@/src/services/inboxService";
-import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
 import { logger } from "@/src/utils/logger";
@@ -75,7 +75,7 @@ export const addToAllianceController: RequestHandler = async (req, res) => {
     const invitedClanOwnerMember = (await GuildMember.findOne({ guildId: guilds[0]._id, rank: 0 }))!;
     const senderInventory = await getInventory(account._id.toString(), "ActiveAvatarImageType");
     const senderGuild = (await Guild.findById(allianceMember.guildId, "Name"))!;
-    const alliance = (await Alliance.findById(req.query.allianceId as string, "Name"))!;
+    const alliance = (await Alliance.findById(req.query.allianceId, "Name"))!;
     await createMessage(invitedClanOwnerMember.accountId, [
         {
             sndr: getSuffixedName(account),
@@ -95,7 +95,7 @@ export const addToAllianceController: RequestHandler = async (req, res) => {
                 }
             ],
             sub: "/Lotus/Language/Menu/Mailbox_AllianceInvite_Title",
-            icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
+            icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
             contextInfo: alliance._id.toString(),
             highPriority: true,
             acceptAction: "ALLIANCE_INVITE",

src/controllers/api/addToGuildController.ts

@@ -1,10 +1,8 @@
-import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
 import { Account } from "@/src/models/loginModel";
-import { addInventoryDataToFriendInfo, areFriends } from "@/src/services/friendService";
-import { hasGuildPermission } from "@/src/services/guildService";
+import { fillInInventoryDataForGuildMember, hasGuildPermission } from "@/src/services/guildService";
 import { createMessage } from "@/src/services/inboxService";
-import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";
 import { IOid } from "@/src/types/commonTypes";
 import { GuildPermission, IGuildMemberClient } from "@/src/types/guildTypes";
@@ -24,18 +22,15 @@ export const addToGuildController: RequestHandler = async (req, res) => {
             return;
         }
 
-        const senderAccount = await getAccountForRequest(req);
         const inventory = await getInventory(account._id.toString(), "Settings");
-        if (
-            inventory.Settings?.GuildInvRestriction == "GIFT_MODE_NONE" ||
-            (inventory.Settings?.GuildInvRestriction == "GIFT_MODE_FRIENDS" &&
-                !(await areFriends(account._id, senderAccount._id)))
-        ) {
+        // TODO: Also consider GIFT_MODE_FRIENDS once friends are implemented
+        if (inventory.Settings?.GuildInvRestriction == "GIFT_MODE_NONE") {
             res.status(400).json("Invite restricted");
             return;
         }
 
         const guild = (await Guild.findById(payload.GuildId.$oid, "Name Ranks"))!;
+        const senderAccount = await getAccountForRequest(req);
         if (!(await hasGuildPermission(guild, senderAccount._id.toString(), GuildPermission.Recruiter))) {
             res.status(400).json("Invalid permission");
         }
@@ -64,7 +59,7 @@ export const addToGuildController: RequestHandler = async (req, res) => {
                     }
                 ],
                 sub: "/Lotus/Language/Menu/Mailbox_ClanInvite_Title",
-                icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
+                icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
                 contextInfo: payload.GuildId.$oid,
                 highPriority: true,
                 acceptAction: "GUILD_INVITE",
@@ -76,11 +71,10 @@ export const addToGuildController: RequestHandler = async (req, res) => {
         const member: IGuildMemberClient = {
             _id: { $oid: account._id.toString() },
             DisplayName: account.DisplayName,
-            LastLogin: toMongoDate(account.LastLogin),
             Rank: 7,
             Status: 2
         };
-        await addInventoryDataToFriendInfo(member);
+        await fillInInventoryDataForGuildMember(member);
         res.json({ NewMember: member });
     } else if ("RequestMsg" in payload) {
         // Player applying to join a clan

src/controllers/api/adoptPetController.ts

@@ -1,27 +0,0 @@
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const adoptPetController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "KubrowPets");
-    const data = getJSONfromString<IAdoptPetRequest>(String(req.body));
-    const details = inventory.KubrowPets.id(data.petId)!.Details!;
-    details.Name = data.name;
-    await inventory.save();
-    res.json({
-        petId: data.petId,
-        newName: data.name
-    } satisfies IAdoptPetResponse);
-};
-
-interface IAdoptPetRequest {
-    petId: string;
-    name: string;
-}
-
-interface IAdoptPetResponse {
-    petId: string;
-    newName: string;
-}

src/controllers/api/artifactTransmutationController.ts

@@ -1,9 +1,9 @@
-import { fromOid, toOid } from "@/src/helpers/inventoryHelpers";
+import { toOid } from "@/src/helpers/inventoryHelpers";
 import { createVeiledRivenFingerprint, rivenRawToRealWeighted } from "@/src/helpers/rivenHelper";
 import { addMiscItems, addMods, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getRandomElement, getRandomWeightedReward, getRandomWeightedRewardUc } from "@/src/services/rngService";
-import { IUpgradeFromClient } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IOid } from "@/src/types/commonTypes";
 import { RequestHandler } from "express";
 import { ExportBoosterPacks, ExportUpgrades, TRarity } from "warframe-public-export-plus";
 
@@ -24,11 +24,11 @@ export const artifactTransmutationController: RequestHandler = async (req, res)
         ]);
 
         payload.Consumed.forEach(upgrade => {
-            inventory.Upgrades.pull({ _id: fromOid(upgrade.ItemId) });
+            inventory.Upgrades.pull({ _id: upgrade.ItemId.$oid });
         });
 
         const rawRivenType = getRandomRawRivenType();
-        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType])!;
+        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType]);
         const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
 
         const upgradeIndex =
@@ -57,8 +57,8 @@ export const artifactTransmutationController: RequestHandler = async (req, res)
         payload.Consumed.forEach(upgrade => {
             const meta = ExportUpgrades[upgrade.ItemType];
             counts[meta.rarity] += upgrade.ItemCount;
-            if (fromOid(upgrade.ItemId) != "000000000000000000000000") {
-                inventory.Upgrades.pull({ _id: fromOid(upgrade.ItemId) });
+            if (upgrade.ItemId.$oid != "000000000000000000000000") {
+                inventory.Upgrades.pull({ _id: upgrade.ItemId.$oid });
             } else {
                 addMods(inventory, [
                     {
@@ -128,14 +128,24 @@ const getRandomRawRivenType = (): string => {
 };
 
 interface IArtifactTransmutationRequest {
-    Upgrade: IUpgradeFromClient;
+    Upgrade: IAgnosticUpgradeClient;
     LevelDiff: number;
-    Consumed: IUpgradeFromClient[];
+    Consumed: IAgnosticUpgradeClient[];
     Cost: number;
     FusionPointCost: number;
     RivenTransmute?: boolean;
 }
 
+interface IAgnosticUpgradeClient {
+    ItemType: string;
+    ItemId: IOid;
+    FromSKU: boolean;
+    UpgradeFingerprint: string;
+    PendingRerollFingerprint: string;
+    ItemCount: number;
+    LastAdded: IOid;
+}
+
 const specialModSets: string[][] = [
     [
         "/Lotus/Upgrades/Mods/Immortal/ImmortalOneMod",

src/controllers/api/claimCompletedRecipeController.ts

@@ -4,9 +4,9 @@
 import { RequestHandler } from "express";
 import { logger } from "@/src/utils/logger";
 import { getRecipe } from "@/src/services/itemDataService";
-import { IOid, IOidWithLegacySupport } from "@/src/types/commonTypes";
+import { IOid } from "@/src/types/commonTypes";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import {
     getInventory,
     updateCurrency,
@@ -17,11 +17,8 @@ import {
 } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
-import { InventorySlot, IPendingRecipeDatabase, Status } from "@/src/types/inventoryTypes/inventoryTypes";
-import { toOid2 } from "@/src/helpers/inventoryHelpers";
-import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
-import { IRecipe } from "warframe-public-export-plus";
-import { config } from "@/src/services/configService";
+import { InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
+import { toOid } from "@/src/helpers/inventoryHelpers";
 
 interface IClaimCompletedRecipeRequest {
     RecipeIds: IOid[];
@@ -29,8 +26,10 @@ interface IClaimCompletedRecipeRequest {
 
 export const claimCompletedRecipeController: RequestHandler = async (req, res) => {
     const claimCompletedRecipeRequest = getJSONfromString<IClaimCompletedRecipeRequest>(String(req.body));
-    const account = await getAccountForRequest(req);
-    const inventory = await getInventory(account._id.toString());
+    const accountId = await getAccountIdForRequest(req);
+    if (!accountId) throw new Error("no account id");
+
+    const inventory = await getInventory(accountId);
     const pendingRecipe = inventory.PendingRecipes.id(claimCompletedRecipeRequest.RecipeIds[0].$oid);
     if (!pendingRecipe) {
         throw new Error(`no pending recipe found with id ${claimCompletedRecipeRequest.RecipeIds[0].$oid}`);
@@ -49,14 +48,40 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
     }
 
     if (req.query.cancel) {
-        const inventoryChanges: IInventoryChanges = {};
-        await refundRecipeIngredients(inventory, inventoryChanges, recipe, pendingRecipe);
+        const inventoryChanges: IInventoryChanges = {
+            ...updateCurrency(inventory, recipe.buildPrice * -1, false)
+        };
+
+        const equipmentIngredients = new Set();
+        for (const category of ["LongGuns", "Pistols", "Melee"] as const) {
+            if (pendingRecipe[category]) {
+                pendingRecipe[category].forEach(item => {
+                    const index = inventory[category].push(item) - 1;
+                    inventoryChanges[category] ??= [];
+                    inventoryChanges[category].push(inventory[category][index].toJSON<IEquipmentClient>());
+                    equipmentIngredients.add(item.ItemType);
+
+                    occupySlot(inventory, InventorySlot.WEAPONS, false);
+                    inventoryChanges.WeaponBin ??= { Slots: 0 };
+                    inventoryChanges.WeaponBin.Slots -= 1;
+                });
+            }
+        }
+        for (const ingredient of recipe.ingredients) {
+            if (!equipmentIngredients.has(ingredient.ItemType)) {
+                combineInventoryChanges(
+                    inventoryChanges,
+                    await addItem(inventory, ingredient.ItemType, ingredient.ItemCount)
+                );
+            }
+        }
+
         await inventory.save();
         res.json(inventoryChanges); // Not a bug: In the specific case of cancelling a recipe, InventoryChanges are expected to be the root.
     } else {
         logger.debug("Claiming Recipe", { recipe, pendingRecipe });
 
-        let BrandedSuits: undefined | IOidWithLegacySupport[];
+        let BrandedSuits: undefined | IOid[];
         if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
             inventory.PendingSpectreLoadouts ??= [];
             inventory.SpectreLoadouts ??= [];
@@ -81,7 +106,7 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
                 inventory.BrandedSuits!.findIndex(x => x.equals(pendingRecipe.SuitToUnbrand)),
                 1
             );
-            BrandedSuits = [toOid2(pendingRecipe.SuitToUnbrand!, account.BuildLabel)];
+            BrandedSuits = [toOid(pendingRecipe.SuitToUnbrand!)];
         }
 
         let InventoryChanges: IInventoryChanges = {};
@@ -105,73 +130,13 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
                 ...updateCurrency(inventory, cost, true)
             };
         }
-
-        if (recipe.secretIngredientAction == "SIA_CREATE_KUBROW") {
-            const pet = inventory.KubrowPets.id(pendingRecipe.KubrowPet!)!;
-            if (pet.Details!.HatchDate!.getTime() > Date.now()) {
-                pet.Details!.HatchDate = new Date();
-            }
-            let canSetActive = true;
-            for (const pet of inventory.KubrowPets) {
-                if (pet.Details!.Status == Status.StatusAvailable) {
-                    canSetActive = false;
-                    break;
-                }
-            }
-            pet.Details!.Status = canSetActive ? Status.StatusAvailable : Status.StatusStasis;
-        } else if (recipe.secretIngredientAction != "SIA_UNBRAND") {
+        if (recipe.secretIngredientAction != "SIA_UNBRAND") {
             InventoryChanges = {
                 ...InventoryChanges,
-                ...(await addItem(
-                    inventory,
-                    recipe.resultType,
-                    recipe.num,
-                    false,
-                    undefined,
-                    pendingRecipe.TargetFingerprint
-                ))
+                ...(await addItem(inventory, recipe.resultType, recipe.num, false))
             };
         }
-        if (
-            config.claimingBlueprintRefundsIngredients &&
-            recipe.secretIngredientAction != "SIA_CREATE_KUBROW" // Can't refund the egg
-        ) {
-            await refundRecipeIngredients(inventory, InventoryChanges, recipe, pendingRecipe);
-        }
         await inventory.save();
         res.json({ InventoryChanges, BrandedSuits });
     }
 };
-
-const refundRecipeIngredients = async (
-    inventory: TInventoryDatabaseDocument,
-    inventoryChanges: IInventoryChanges,
-    recipe: IRecipe,
-    pendingRecipe: IPendingRecipeDatabase
-): Promise<void> => {
-    updateCurrency(inventory, recipe.buildPrice * -1, false, inventoryChanges);
-
-    const equipmentIngredients = new Set();
-    for (const category of ["LongGuns", "Pistols", "Melee"] as const) {
-        if (pendingRecipe[category]) {
-            pendingRecipe[category].forEach(item => {
-                const index = inventory[category].push(item) - 1;
-                inventoryChanges[category] ??= [];
-                inventoryChanges[category].push(inventory[category][index].toJSON<IEquipmentClient>());
-                equipmentIngredients.add(item.ItemType);
-
-                occupySlot(inventory, InventorySlot.WEAPONS, false);
-                inventoryChanges.WeaponBin ??= { Slots: 0 };
-                inventoryChanges.WeaponBin.Slots -= 1;
-            });
-        }
-    }
-    for (const ingredient of recipe.ingredients) {
-        if (!equipmentIngredients.has(ingredient.ItemType)) {
-            combineInventoryChanges(
-                inventoryChanges,
-                await addItem(inventory, ingredient.ItemType, ingredient.ItemCount)
-            );
-        }
-    }
-};

src/controllers/api/claimLibraryDailyTaskRewardController.ts

@@ -1,4 +1,4 @@
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
@@ -17,7 +17,7 @@ export const claimLibraryDailyTaskRewardController: RequestHandler = async (req,
     }
     syndicate.Standing += rewardStanding;
 
-    addFusionPoints(inventory, 80 * rewardQuantity);
+    inventory.FusionPoints += 80 * rewardQuantity;
     await inventory.save();
 
     res.json({

src/controllers/api/completeCalendarEventController.ts

@@ -1,41 +0,0 @@
-import { getCalendarProgress, getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { getWorldState } from "@/src/services/worldStateService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { RequestHandler } from "express";
-
-// GET request; query parameters: CompletedEventIdx=0&Iteration=4&Version=19&Season=CST_SUMMER
-export const completeCalendarEventController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const calendarProgress = getCalendarProgress(inventory);
-    const currentSeason = getWorldState().KnownCalendarSeasons[0];
-    let inventoryChanges: IInventoryChanges = {};
-    let dayIndex = 0;
-    for (const day of currentSeason.Days) {
-        if (day.events.length == 0 || day.events[0].type != "CET_CHALLENGE") {
-            if (dayIndex == calendarProgress.SeasonProgress.LastCompletedDayIdx) {
-                if (day.events.length != 0) {
-                    const selection = day.events[parseInt(req.query.CompletedEventIdx as string)];
-                    if (selection.type == "CET_REWARD") {
-                        inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory))
-                            .InventoryChanges;
-                    } else if (selection.type == "CET_UPGRADE") {
-                        calendarProgress.YearProgress.Upgrades.push(selection.upgrade!);
-                    } else if (selection.type != "CET_PLOT") {
-                        throw new Error(`unexpected selection type: ${selection.type}`);
-                    }
-                }
-                break;
-            }
-            ++dayIndex;
-        }
-    }
-    calendarProgress.SeasonProgress.LastCompletedDayIdx++;
-    await inventory.save();
-    res.json({
-        InventoryChanges: inventoryChanges,
-        CalendarProgress: inventory.CalendarProgress
-    });
-};

src/controllers/api/confirmGuildInvitationController.ts

@@ -1,14 +1,8 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
 import { Account } from "@/src/models/loginModel";
-import {
-    deleteGuild,
-    getGuildClient,
-    giveClanKey,
-    hasGuildPermission,
-    removeDojoKeyItems
-} from "@/src/services/guildService";
-import { getInventory } from "@/src/services/inventoryService";
+import { deleteGuild, getGuildClient, hasGuildPermission, removeDojoKeyItems } from "@/src/services/guildService";
+import { addRecipes, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
@@ -47,7 +41,14 @@ export const confirmGuildInvitationGetController: RequestHandler = async (req, r
         // Update inventory of new member
         const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        giveClanKey(inventory, inventoryChanges);
+        const recipeChanges = [
+            {
+                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                ItemCount: 1
+            }
+        ];
+        addRecipes(inventory, recipeChanges);
+        combineInventoryChanges(inventoryChanges, { Recipes: recipeChanges });
         await inventory.save();
 
         const guild = (await Guild.findById(req.query.clanId as string))!;
@@ -62,7 +63,7 @@ export const confirmGuildInvitationGetController: RequestHandler = async (req, r
         await guild.save();
 
         res.json({
-            ...(await getGuildClient(guild, account)),
+            ...(await getGuildClient(guild, account._id.toString())),
             InventoryChanges: inventoryChanges
         });
     } else {
@@ -95,9 +96,14 @@ export const confirmGuildInvitationPostController: RequestHandler = async (req,
         await GuildMember.deleteMany({ accountId: guildMember.accountId, status: 1 });
 
         // Update inventory of new member
-        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId LevelKeys Recipes");
+        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        giveClanKey(inventory);
+        addRecipes(inventory, [
+            {
+                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                ItemCount: 1
+            }
+        ]);
         await inventory.save();
 
         // Add join to clan log

src/controllers/api/contributeGuildClassController.ts

@@ -2,7 +2,7 @@ import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild } from "@/src/models/guildModel";
 import { checkClanAscensionHasRequiredContributors } from "@/src/services/guildService";
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 import { Types } from "mongoose";
@@ -36,7 +36,7 @@ export const contributeGuildClassController: RequestHandler = async (req, res) =
 
     // Either way, endo is given to the contributor.
     const inventory = await getInventory(accountId, "FusionPoints");
-    addFusionPoints(inventory, guild.CeremonyEndo!);
+    inventory.FusionPoints += guild.CeremonyEndo!;
     await inventory.save();
 
     res.json({

src/controllers/api/createGuildController.ts

@@ -1,17 +1,16 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
-import { createUniqueClanName, getGuildClient, giveClanKey } from "@/src/services/guildService";
-import { getInventory } from "@/src/services/inventoryService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { createUniqueClanName, getGuildClient } from "@/src/services/guildService";
+import { addRecipes, getInventory } from "@/src/services/inventoryService";
 
 export const createGuildController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
     const payload = getJSONfromString<ICreateGuildRequest>(String(req.body));
 
     // Remove pending applications for this account
-    await GuildMember.deleteMany({ accountId: account._id, status: 1 });
+    await GuildMember.deleteMany({ accountId, status: 1 });
 
     // Create guild on database
     const guild = new Guild({
@@ -21,21 +20,32 @@ export const createGuildController: RequestHandler = async (req, res) => {
 
     // Create guild member on database
     await GuildMember.insertOne({
-        accountId: account._id,
+        accountId: accountId,
         guildId: guild._id,
         status: 0,
         rank: 0
     });
 
-    const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys Recipes");
+    const inventory = await getInventory(accountId, "GuildId Recipes");
     inventory.GuildId = guild._id;
-    const inventoryChanges: IInventoryChanges = {};
-    giveClanKey(inventory, inventoryChanges);
+    addRecipes(inventory, [
+        {
+            ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+            ItemCount: 1
+        }
+    ]);
     await inventory.save();
 
     res.json({
-        ...(await getGuildClient(guild, account)),
-        InventoryChanges: inventoryChanges
+        ...(await getGuildClient(guild, accountId)),
+        InventoryChanges: {
+            Recipes: [
+                {
+                    ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                    ItemCount: 1
+                }
+            ]
+        }
     });
 };
 

src/controllers/api/crewMembersController.ts

@@ -1,5 +1,4 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { ICrewMemberClient } from "@/src/types/inventoryTypes/inventoryTypes";
@@ -8,23 +7,15 @@ import { Types } from "mongoose";
 
 export const crewMembersController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "CrewMembers NemesisHistory");
+    const inventory = await getInventory(accountId, "CrewMembers");
     const data = getJSONfromString<ICrewMembersRequest>(String(req.body));
-    if (data.crewMember.SecondInCommand) {
-        clearOnCall(inventory);
-    }
-    if (data.crewMember.ItemId.$oid == "000000000000000000000000") {
-        const convertedNemesis = inventory.NemesisHistory!.find(x => x.fp == data.crewMember.NemesisFingerprint)!;
-        convertedNemesis.SecondInCommand = data.crewMember.SecondInCommand;
-    } else {
-        const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
-        dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
-        dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
-        dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
-        dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
-        dbCrewMember.Configs = data.crewMember.Configs;
-        dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
-    }
+    const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
+    dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
+    dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
+    dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
+    dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
+    dbCrewMember.Configs = data.crewMember.Configs;
+    dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
     await inventory.save();
     res.json({
         crewMemberId: data.crewMember.ItemId.$oid,
@@ -35,20 +26,3 @@ export const crewMembersController: RequestHandler = async (req, res) => {
 interface ICrewMembersRequest {
     crewMember: ICrewMemberClient;
 }
-
-const clearOnCall = (inventory: TInventoryDatabaseDocument): void => {
-    for (const cm of inventory.CrewMembers) {
-        if (cm.SecondInCommand) {
-            cm.SecondInCommand = false;
-            return;
-        }
-    }
-    if (inventory.NemesisHistory) {
-        for (const cm of inventory.NemesisHistory) {
-            if (cm.SecondInCommand) {
-                cm.SecondInCommand = false;
-                return;
-            }
-        }
-    }
-};

src/controllers/api/crewShipIdentifySalvageController.ts

@@ -62,7 +62,14 @@ export const crewShipIdentifySalvageController: RequestHandler = async (req, res
                 } satisfies IInnateDamageFingerprint)
             };
         }
-        addEquipment(inventory, "CrewShipSalvagedWeapons", payload.ItemType, defaultOverwrites, inventoryChanges);
+        addEquipment(
+            inventory,
+            "CrewShipSalvagedWeapons",
+            payload.ItemType,
+            undefined,
+            inventoryChanges,
+            defaultOverwrites
+        );
     }
 
     inventoryChanges.CrewShipRawSalvage = [

src/controllers/api/endlessXpController.ts

@@ -1,529 +1,60 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { IEndlessXpReward, IInventoryClient, TEndlessXpCategory } from "@/src/types/inventoryTypes/inventoryTypes";
-import { logger } from "@/src/utils/logger";
-import { ExportRewards, ICountedStoreItem } from "warframe-public-export-plus";
-import { getRandomElement } from "@/src/services/rngService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { TEndlessXpCategory } from "@/src/types/inventoryTypes/inventoryTypes";
 
 export const endlessXpController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
     const payload = getJSONfromString<IEndlessXpRequest>(String(req.body));
-    if (payload.Mode == "r") {
-        const inventory = await getInventory(accountId, "EndlessXP");
-        inventory.EndlessXP ??= [];
-        let entry = inventory.EndlessXP.find(x => x.Category == payload.Category);
-        if (!entry) {
-            entry = {
-                Category: payload.Category,
-                Earn: 0,
-                Claim: 0,
-                Choices: payload.Choices,
-                PendingRewards: []
-            };
-            inventory.EndlessXP.push(entry);
-        }
 
-        const weekStart = 1734307200_000 + Math.trunc((Date.now() - 1734307200_000) / 604800000) * 604800000;
-        const weekEnd = weekStart + 604800000;
-
-        entry.Earn = 0;
-        entry.Claim = 0;
-        entry.BonusAvailable = new Date(weekStart);
-        entry.Expiry = new Date(weekEnd);
+    inventory.EndlessXP ??= [];
+    const entry = inventory.EndlessXP.find(x => x.Category == payload.Category);
+    if (entry) {
         entry.Choices = payload.Choices;
-        entry.PendingRewards =
-            payload.Category == "EXC_HARD"
-                ? generateHardModeRewards(payload.Choices)
-                : generateNormalModeRewards(payload.Choices);
-
-        await inventory.save();
-        res.json({
-            NewProgress: inventory.toJSON<IInventoryClient>().EndlessXP!.find(x => x.Category == payload.Category)!
-        });
-    } else if (payload.Mode == "c") {
-        const inventory = await getInventory(accountId);
-        const entry = inventory.EndlessXP!.find(x => x.Category == payload.Category)!;
-        const inventoryChanges: IInventoryChanges = {};
-        for (const reward of entry.PendingRewards) {
-            if (entry.Claim < reward.RequiredTotalXp && reward.RequiredTotalXp <= entry.Earn) {
-                combineInventoryChanges(
-                    inventoryChanges,
-                    (
-                        await handleStoreItemAcquisition(
-                            reward.Rewards[0].StoreItem,
-                            inventory,
-                            reward.Rewards[0].ItemCount
-                        )
-                    ).InventoryChanges
-                );
-            }
-        }
-        entry.Claim = entry.Earn;
-        await inventory.save();
-        res.json({
-            InventoryChanges: inventoryChanges,
-            ClaimedXp: entry.Claim
-        });
     } else {
-        logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
-        throw new Error(`unexpected endlessXp mode: ${payload.Mode}`);
+        inventory.EndlessXP.push({
+            Category: payload.Category,
+            Choices: payload.Choices
+        });
     }
-};
+    await inventory.save();
 
-type IEndlessXpRequest =
-    | {
-          Mode: "r";
-          Category: TEndlessXpCategory;
-          Choices: string[];
-      }
-    | {
-          Mode: "c" | "something else";
-          Category: TEndlessXpCategory;
-      };
-
-const generateRandomRewards = (deckName: string): ICountedStoreItem[] => {
-    const reward = getRandomElement(ExportRewards[deckName][0])!;
-    return [
-        {
-            StoreItem: reward.type,
-            ItemCount: reward.itemCount
-        }
-    ];
-};
-
-const normalModeChosenRewards: Record<string, string[]> = {
-    Excalibur: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Excalibur/RadialJavelinAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburBlueprint"
-    ],
-    Trinity: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Trinity/EnergyVampireAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinitySystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityBlueprint"
-    ],
-    Ember: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Ember/WorldOnFireAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberBlueprint"
-    ],
-    Loki: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Loki/InvisibilityAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKISystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIBlueprint"
-    ],
-    Mag: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Mag/CrushAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagBlueprint"
-    ],
-    Rhino: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Rhino/RhinoChargeAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoBlueprint"
-    ],
-    Ash: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Ninja/GlaiveAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshBlueprint"
-    ],
-    Frost: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Frost/IceShieldAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostBlueprint"
-    ],
-    Nyx: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Jade/SelfBulletAttractorAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxBlueprint"
-    ],
-    Saryn: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Saryn/PoisonAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynBlueprint"
-    ],
-    Vauban: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Trapper/LevTrapAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperBlueprint"
-    ],
-    Nova: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/AntiMatter/MolecularPrimeAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaBlueprint"
-    ],
-    Nekros: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Necro/CloneTheDeadAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroBlueprint"
-    ],
-    Valkyr: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Berserker/IntimidateAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerBlueprint"
-    ],
-    Oberon: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Paladin/RegenerationAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinBlueprint"
-    ],
-    Hydroid: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Pirate/CannonBarrageAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidBlueprint"
-    ],
-    Mirage: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Harlequin/LightAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinBlueprint"
-    ],
-    Limbo: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Magician/TearInSpaceAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianBlueprint"
-    ],
-    Mesa: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Cowgirl/GunFuPvPAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerBlueprint"
-    ],
-    Chroma: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Dragon/DragonLuckAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaBlueprint"
-    ],
-    Atlas: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Brawler/BrawlerPassiveAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerBlueprint"
-    ],
-    Ivara: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Ranger/RangerStealAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerBlueprint"
-    ],
-    Inaros: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Sandman/SandmanSwarmAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummySystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyBlueprint"
-    ],
-    Titania: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Fairy/FairyFlightAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairySystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyBlueprint"
-    ],
-    Nidus: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Infestation/InfestPodsAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusBlueprint"
-    ],
-    Octavia: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Bard/BardCharmAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaBlueprint"
-    ],
-    Harrow: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Priest/PriestPactAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestBlueprint"
-    ],
-    Gara: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Glass/GlassFragmentAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassBlueprint"
-    ],
-    Khora: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Khora/KhoraCrackAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraBlueprint"
-    ],
-    Revenant: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Revenant/RevenantMarkAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantBlueprint"
-    ],
-    Garuda: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Garuda/GarudaUnstoppableAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaBlueprint"
-    ],
-    Baruuk: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/Pacifist/PacifistFistAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistBlueprint"
-    ],
-    Hildryn: [
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeHelmetBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeChassisBlueprint",
-        "/Lotus/StoreItems/Powersuits/IronFrame/IronFrameStripAugmentCard",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeSystemsBlueprint",
-        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeBlueprint"
-    ]
-};
-
-const generateNormalModeRewards = (choices: string[]): IEndlessXpReward[] => {
-    const choiceRewards = normalModeChosenRewards[choices[0]];
-    return [
-        {
-            RequiredTotalXp: 190,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalSilverRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 400,
-            Rewards: [
-                {
-                    StoreItem: choiceRewards[0],
-                    ItemCount: 1
+    res.json({
+        NewProgress: {
+            Category: payload.Category,
+            Earn: 0,
+            Claim: 0,
+            BonusAvailable: {
+                $date: {
+                    $numberLong: "9999999999999"
                 }
-            ]
-        },
-        {
-            RequiredTotalXp: 630,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalSilverRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 890,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalMODRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 1190,
-            Rewards: [
-                {
-                    StoreItem: choiceRewards[1],
-                    ItemCount: 1
+            },
+            Expiry: {
+                $date: {
+                    $numberLong: "9999999999999"
                 }
-            ]
-        },
-        {
-            RequiredTotalXp: 1540,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalGoldRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 1950,
-            Rewards: [
+            },
+            Choices: payload.Choices,
+            PendingRewards: [
                 {
-                    StoreItem: choiceRewards[2],
-                    ItemCount: 1
-                }
-            ]
-        },
-        {
-            RequiredTotalXp: 2430,
-            Rewards: [
-                {
-                    StoreItem: choiceRewards[3],
-                    ItemCount: 1
-                }
-            ]
-        },
-        {
-            RequiredTotalXp: 2990,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalArcaneRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 3640,
-            Rewards: [
-                {
-                    StoreItem: choiceRewards[4],
-                    ItemCount: 1
+                    RequiredTotalXp: 190,
+                    Rewards: [
+                        {
+                            StoreItem: "/Lotus/StoreItems/Upgrades/Mods/Aura/PlayerHealthAuraMod",
+                            ItemCount: 1
+                        }
+                    ]
                 }
+                // ...
             ]
         }
-    ];
+    });
 };
 
-const hardModeChosenRewards: Record<string, string> = {
-    Braton: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BratonIncarnonUnlocker",
-    Lato: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/LatoIncarnonUnlocker",
-    Skana: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/SkanaIncarnonUnlocker",
-    Paris: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/ParisIncarnonUnlocker",
-    Kunai: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/KunaiIncarnonUnlocker",
-    Boar: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BoarIncarnonUnlocker",
-    Gammacor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/GammacorIncarnonUnlocker",
-    Anku: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/AnkuIncarnonUnlocker",
-    Gorgon: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/GorgonIncarnonUnlocker",
-    Angstrum: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/AngstrumIncarnonUnlocker",
-    Bo: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/BoIncarnonUnlocker",
-    Latron: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/LatronIncarnonUnlocker",
-    Furis: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/FurisIncarnonUnlocker",
-    Furax: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/FuraxIncarnonUnlocker",
-    Strun: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/StrunIncarnonUnlocker",
-    Lex: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/LexIncarnonUnlocker",
-    Magistar: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/MagistarIncarnonUnlocker",
-    Boltor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BoltorIncarnonUnlocker",
-    Bronco: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/BroncoIncarnonUnlocker",
-    CeramicDagger: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/CeramicDaggerIncarnonUnlocker",
-    Torid: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/ToridIncarnonUnlocker",
-    DualToxocyst: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/DualToxocystIncarnonUnlocker",
-    DualIchor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/DualIchorIncarnonUnlocker",
-    Miter: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/MiterIncarnonUnlocker",
-    Atomos: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/AtomosIncarnonUnlocker",
-    AckAndBrunt: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/AckAndBruntIncarnonUnlocker",
-    Soma: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/SomaIncarnonUnlocker",
-    Vasto: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/VastoIncarnonUnlocker",
-    NamiSolo: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/NamiSoloIncarnonUnlocker",
-    Burston: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BurstonIncarnonUnlocker",
-    Zylok: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/ZylokIncarnonUnlocker",
-    Sibear: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/SibearIncarnonUnlocker",
-    Dread: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/DreadIncarnonUnlocker",
-    Despair: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/DespairIncarnonUnlocker",
-    Hate: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/HateIncarnonUnlocker",
-    Dera: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/DeraIncarnonUnlocker",
-    Cestra: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/CestraIncarnonUnlocker",
-    Okina: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/OkinaIncarnonUnlocker",
-    Sybaris: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/SybarisIncarnonUnlocker",
-    Sicarus: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/SicarusIncarnonUnlocker",
-    RivenPrimary: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawRifleRandomMod",
-    RivenSecondary: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawPistolRandomMod",
-    RivenMelee: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawMeleeRandomMod",
-    Kuva: "/Lotus/Types/Game/DuviriEndless/CircuitSteelPathBIGKuvaReward"
-};
-
-const generateHardModeRewards = (choices: string[]): IEndlessXpReward[] => {
-    return [
-        {
-            RequiredTotalXp: 285,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 600,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathArcaneRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 945,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 1335,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 1785,
-            Rewards: [
-                {
-                    StoreItem: hardModeChosenRewards[choices[0]],
-                    ItemCount: 1
-                }
-            ]
-        },
-        {
-            RequiredTotalXp: 2310,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathGoldRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 2925,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathGoldRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 3645,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathArcaneRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 4485,
-            Rewards: generateRandomRewards(
-                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSteelEssenceRewards"
-            )
-        },
-        {
-            RequiredTotalXp: 5460,
-            Rewards: [
-                {
-                    StoreItem: hardModeChosenRewards[choices[1]],
-                    ItemCount: 1
-                }
-            ]
-        }
-    ];
-};
+interface IEndlessXpRequest {
+    Mode: string; // "r"
+    Category: TEndlessXpCategory;
+    Choices: string[];
+}

src/controllers/api/fishmongerController.ts

@@ -30,14 +30,15 @@ export const fishmongerController: RequestHandler = async (req, res) => {
         miscItemChanges.push({ ItemType: fish.ItemType, ItemCount: fish.ItemCount * -1 });
     }
     addMiscItems(inventory, miscItemChanges);
-    if (gainedStanding && syndicateTag) addStanding(inventory, syndicateTag, gainedStanding);
+    let affiliationMod;
+    if (gainedStanding && syndicateTag) affiliationMod = addStanding(inventory, syndicateTag, gainedStanding);
     await inventory.save();
     res.json({
         InventoryChanges: {
             MiscItems: miscItemChanges
         },
         SyndicateTag: syndicateTag,
-        StandingChange: gainedStanding
+        StandingChange: affiliationMod?.Standing || 0
     });
 };
 

src/controllers/api/focusController.ts

@@ -64,9 +64,7 @@ export const focusController: RequestHandler = async (req, res) => {
                 }
             );
 
-            res.json({
-                FocusUpgrade: { ItemType: focusType }
-            });
+            res.end();
             break;
         }
         case FocusOperation.UnlockUpgrade: {
@@ -106,14 +104,13 @@ export const focusController: RequestHandler = async (req, res) => {
         }
         case FocusOperation.SentTrainingAmplifier: {
             const request = JSON.parse(String(req.body)) as ISentTrainingAmplifierRequest;
+            const parts: string[] = [
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
+            ];
             const inventory = await getInventory(accountId);
-            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, {
-                ModularParts: [
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
-                ]
-            });
+            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, parts);
             occupySlot(inventory, InventorySlot.AMPS, false);
             await inventory.save();
             res.json((inventoryChanges.OperatorAmps as IEquipmentClient[])[0]);

src/controllers/api/gardeningController.ts

@@ -1,84 +0,0 @@
-import { toMongoDate } from "@/src/helpers/inventoryHelpers";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { addMiscItem, getInventory } from "@/src/services/inventoryService";
-import { toStoreItem } from "@/src/services/itemDataService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
-import { IMongoDate } from "@/src/types/commonTypes";
-import { IMissionReward } from "@/src/types/missionTypes";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { IGardeningClient } from "@/src/types/shipTypes";
-import { RequestHandler } from "express";
-import { dict_en, ExportResources } from "warframe-public-export-plus";
-
-export const gardeningController: RequestHandler = async (req, res) => {
-    const data = getJSONfromString<IGardeningRequest>(String(req.body));
-    if (data.Mode != "HarvestAll") {
-        throw new Error(`unexpected gardening mode: ${data.Mode}`);
-    }
-
-    const accountId = await getAccountIdForRequest(req);
-    const [inventory, personalRooms] = await Promise.all([
-        getInventory(accountId, "MiscItems"),
-        getPersonalRooms(accountId, "Apartment")
-    ]);
-
-    // Harvest plants
-    const inventoryChanges: IInventoryChanges = {};
-    const rewards: Record<string, IMissionReward[][]> = {};
-    for (const planter of personalRooms.Apartment.Gardening.Planters) {
-        rewards[planter.Name] = [];
-        for (const plant of planter.Plants) {
-            const itemType =
-                "/Lotus/Types/Gameplay/Duviri/Resource/DuviriPlantItem" +
-                plant.PlantType.substring(plant.PlantType.length - 1);
-            const itemCount = Math.random() < 0.775 ? 2 : 4;
-
-            addMiscItem(inventory, itemType, itemCount, inventoryChanges);
-
-            rewards[planter.Name].push([
-                {
-                    StoreItem: toStoreItem(itemType),
-                    TypeName: itemType,
-                    ItemCount: itemCount,
-                    DailyCooldown: false,
-                    Rarity: itemCount == 2 ? 0.7743589743589744 : 0.22564102564102564,
-                    TweetText: `${itemCount}x ${dict_en[ExportResources[itemType].name]} (Resource)`,
-                    ProductCategory: "MiscItems"
-                }
-            ]);
-        }
-    }
-
-    // Refresh garden
-    personalRooms.Apartment.Gardening = createGarden();
-
-    await Promise.all([inventory.save(), personalRooms.save()]);
-
-    const planter = personalRooms.Apartment.Gardening.Planters[personalRooms.Apartment.Gardening.Planters.length - 1];
-    const plant = planter.Plants[planter.Plants.length - 1];
-    res.json({
-        GardenTagName: planter.Name,
-        PlantType: plant.PlantType,
-        PlotIndex: plant.PlotIndex,
-        EndTime: toMongoDate(plant.EndTime),
-        InventoryChanges: inventoryChanges,
-        Gardening: personalRooms.toJSON<IPersonalRoomsClient>().Apartment.Gardening,
-        Rewards: rewards
-    } satisfies IGardeningResponse);
-};
-
-interface IGardeningRequest {
-    Mode: string;
-}
-
-interface IGardeningResponse {
-    GardenTagName: string;
-    PlantType: string;
-    PlotIndex: number;
-    EndTime: IMongoDate;
-    InventoryChanges: IInventoryChanges;
-    Gardening: IGardeningClient;
-    Rewards: Record<string, IMissionReward[][]>;
-}

src/controllers/api/getAllianceController.ts

@@ -18,7 +18,6 @@ export const getAllianceController: RequestHandler = async (req, res) => {
     res.end();
 };
 
-// POST request since U27
 /*interface IGetAllianceRequest {
     memberCount: number;
     clanLeaderName: string;

src/controllers/api/getFriendsController.ts

@@ -1,54 +1,15 @@
-import { toOid } from "@/src/helpers/inventoryHelpers";
-import { Friendship } from "@/src/models/friendModel";
-import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "@/src/services/friendService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/friendTypes";
-import { Request, RequestHandler, Response } from "express";
+import { Request, Response } from "express";
 
 // POST with {} instead of GET as of 38.5.0
-export const getFriendsController: RequestHandler = async (req: Request, res: Response) => {
-    const accountId = await getAccountIdForRequest(req);
-    const response: IGetFriendsResponse = {
-        Current: [],
-        IncomingFriendRequests: [],
-        OutgoingFriendRequests: []
-    };
-    const [internalFriendships, externalFriendships] = await Promise.all([
-        Friendship.find({ owner: accountId }),
-        Friendship.find({ friend: accountId }, "owner Note")
-    ]);
-    for (const externalFriendship of externalFriendships) {
-        if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
-            response.IncomingFriendRequests.push({
-                _id: toOid(externalFriendship.owner),
-                Note: externalFriendship.Note
-            });
-        }
-    }
-    for (const internalFriendship of internalFriendships) {
-        const friendInfo: IFriendInfo = {
-            _id: toOid(internalFriendship.friend)
-        };
-        if (externalFriendships.find(x => x.owner.equals(internalFriendship.friend))) {
-            response.Current.push(friendInfo);
-        } else {
-            response.OutgoingFriendRequests.push(friendInfo);
-        }
-    }
-    const promises: Promise<void>[] = [];
-    for (const arr of Object.values(response)) {
-        for (const friendInfo of arr) {
-            promises.push(addAccountDataToFriendInfo(friendInfo));
-            promises.push(addInventoryDataToFriendInfo(friendInfo));
-        }
-    }
-    await Promise.all(promises);
-    res.json(response);
+const getFriendsController = (_request: Request, response: Response): void => {
+    response.writeHead(200, {
+        //Connection: "keep-alive",
+        //"Content-Encoding": "gzip",
+        "Content-Type": "text/html",
+        // charset: "UTF - 8",
+        "Content-Length": "3"
+    });
+    response.end(Buffer.from([0x7b, 0x7d, 0x0a]));
 };
 
-// interface IGetFriendsResponse {
-//     Current: IFriendInfo[];
-//     IncomingFriendRequests: IFriendInfo[];
-//     OutgoingFriendRequests: IFriendInfo[];
-// }
-type IGetFriendsResponse = Record<"Current" | "IncomingFriendRequests" | "OutgoingFriendRequests", IFriendInfo[]>;
+export { getFriendsController };

src/controllers/api/getGuildController.ts

@@ -1,13 +1,13 @@
 import { RequestHandler } from "express";
 import { Guild } from "@/src/models/guildModel";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { logger } from "@/src/utils/logger";
 import { getInventory } from "@/src/services/inventoryService";
 import { createUniqueClanName, getGuildClient } from "@/src/services/guildService";
 
 export const getGuildController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    const inventory = await getInventory(account._id.toString(), "GuildId");
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId");
     if (inventory.GuildId) {
         const guild = await Guild.findById(inventory.GuildId);
         if (guild) {
@@ -24,7 +24,7 @@ export const getGuildController: RequestHandler = async (req, res) => {
                 guild.CeremonyResetDate = undefined;
                 await guild.save();
             }
-            res.json(await getGuildClient(guild, account));
+            res.json(await getGuildClient(guild, accountId));
             return;
         }
     }

src/controllers/api/getGuildDojoController.ts

@@ -2,7 +2,6 @@ import { RequestHandler } from "express";
 import { Types } from "mongoose";
 import { Guild } from "@/src/models/guildModel";
 import { getDojoClient } from "@/src/services/guildService";
-import { Account } from "@/src/models/loginModel";
 
 export const getGuildDojoController: RequestHandler = async (req, res) => {
     const guildId = req.query.guildId as string;
@@ -26,8 +25,7 @@ export const getGuildDojoController: RequestHandler = async (req, res) => {
     }
 
     const payload: IGetGuildDojoRequest = req.body ? (JSON.parse(String(req.body)) as IGetGuildDojoRequest) : {};
-    const account = await Account.findById(req.query.accountId as string);
-    res.json(await getDojoClient(guild, 0, payload.ComponentId, account?.BuildLabel));
+    res.json(await getDojoClient(guild, 0, payload.ComponentId));
 };
 
 interface IGetGuildDojoRequest {

src/controllers/api/getIgnoredUsersController.ts

@@ -1,7 +1,7 @@
 import { toOid } from "@/src/helpers/inventoryHelpers";
 import { Account, Ignore } from "@/src/models/loginModel";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/friendTypes";
+import { IFriendInfo } from "@/src/types/guildTypes";
 import { parallelForeach } from "@/src/utils/async-utils";
 import { RequestHandler } from "express";
 

src/controllers/api/getShipController.ts

@@ -2,24 +2,19 @@ import { RequestHandler } from "express";
 import { config } from "@/src/services/configService";
 import allShipFeatures from "@/static/fixed_responses/allShipFeatures.json";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
+import { getPersonalRooms } from "@/src/services/personalRoomsService";
+import { getShip } from "@/src/services/shipService";
 import { toOid } from "@/src/helpers/inventoryHelpers";
 import { IGetShipResponse } from "@/src/types/shipTypes";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
+import { IPersonalRooms } from "@/src/types/personalRoomsTypes";
 import { getLoadout } from "@/src/services/loadoutService";
 
 export const getShipController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
     const personalRoomsDb = await getPersonalRooms(accountId);
-
-    // Setup gardening if it's missing. Maybe should be done as part of some quest completion in the future.
-    if (personalRoomsDb.Apartment.Gardening.Planters.length == 0) {
-        personalRoomsDb.Apartment.Gardening = createGarden();
-        await personalRoomsDb.save();
-    }
-
-    const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
+    const personalRooms = personalRoomsDb.toJSON<IPersonalRooms>();
     const loadout = await getLoadout(accountId);
+    const ship = await getShip(personalRoomsDb.activeShipId, "ShipAttachments SkinFlavourItem");
 
     const getShipResponse: IGetShipResponse = {
         ShipOwnerId: accountId,
@@ -29,8 +24,8 @@ export const getShipController: RequestHandler = async (req, res) => {
             ShipId: toOid(personalRoomsDb.activeShipId),
             ShipInterior: {
                 Colors: personalRooms.ShipInteriorColors,
-                ShipAttachments: { HOOD_ORNAMENT: "" },
-                SkinFlavourItem: ""
+                ShipAttachments: ship.ShipAttachments,
+                SkinFlavourItem: ship.SkinFlavourItem
             },
             FavouriteLoadoutId: personalRooms.Ship.FavouriteLoadoutId
                 ? toOid(personalRooms.Ship.FavouriteLoadoutId)

src/controllers/api/getVendorInfoController.ts

@@ -1,29 +1,14 @@
 import { RequestHandler } from "express";
-import { applyStandingToVendorManifest, getVendorManifestByTypeName } from "@/src/services/serversideVendorsService";
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { config } from "@/src/services/configService";
+import { getVendorManifestByTypeName } from "@/src/services/serversideVendorsService";
 
-export const getVendorInfoController: RequestHandler = async (req, res) => {
-    let manifest = getVendorManifestByTypeName(req.query.vendor as string);
-    if (!manifest) {
-        throw new Error(`Unknown vendor: ${req.query.vendor as string}`);
-    }
-
-    // For testing purposes, authenticating with this endpoint is optional here, but would be required on live.
-    if (req.query.accountId) {
-        const accountId = await getAccountIdForRequest(req);
-        const inventory = await getInventory(accountId);
-        manifest = applyStandingToVendorManifest(inventory, manifest);
-        if (config.dev?.keepVendorsExpired) {
-            manifest = {
-                VendorInfo: {
-                    ...manifest.VendorInfo,
-                    Expiry: { $date: { $numberLong: "0" } }
-                }
-            };
+export const getVendorInfoController: RequestHandler = (req, res) => {
+    if (typeof req.query.vendor == "string") {
+        const manifest = getVendorManifestByTypeName(req.query.vendor);
+        if (!manifest) {
+            throw new Error(`Unknown vendor: ${req.query.vendor}`);
         }
+        res.json(manifest);
+    } else {
+        res.status(400).end();
     }
-
-    res.json(manifest);
 };

src/controllers/api/giftingController.ts

@@ -1,19 +1,12 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Account } from "@/src/models/loginModel";
-import { areFriends } from "@/src/services/friendService";
 import { createMessage } from "@/src/services/inboxService";
-import {
-    combineInventoryChanges,
-    getEffectiveAvatarImageType,
-    getInventory,
-    updateCurrency
-} from "@/src/services/inventoryService";
+import { getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
 import { IOid } from "@/src/types/commonTypes";
-import { IInventoryChanges, IPurchaseParams } from "@/src/types/purchaseTypes";
+import { IPurchaseParams } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
-import { ExportBundles, ExportFlavour } from "warframe-public-export-plus";
+import { ExportFlavour } from "warframe-public-export-plus";
 
 export const giftingController: RequestHandler = async (req, res) => {
     const data = getJSONfromString<IGiftingRequest>(String(req.body));
@@ -37,11 +30,8 @@ export const giftingController: RequestHandler = async (req, res) => {
     }
 
     // Cannot gift to players who have gifting disabled.
-    const senderAccount = await getAccountForRequest(req);
-    if (
-        inventory.Settings?.GiftMode == "GIFT_MODE_NONE" ||
-        (inventory.Settings?.GiftMode == "GIFT_MODE_FRIENDS" && !(await areFriends(account._id, senderAccount._id)))
-    ) {
+    // TODO: Also consider GIFT_MODE_FRIENDS once friends are implemented
+    if (inventory.Settings?.GiftMode == "GIFT_MODE_NONE") {
         res.status(400).send("17").end();
         return;
     }
@@ -50,7 +40,11 @@ export const giftingController: RequestHandler = async (req, res) => {
     // TODO: Cannot gift archwing items to players that have not completed the archwing quest. (Code 7)
     // TODO: Cannot gift necramechs to players that have not completed heart of deimos. (Code 20)
 
-    const senderInventory = await getInventory(senderAccount._id.toString());
+    const senderAccount = await getAccountForRequest(req);
+    const senderInventory = await getInventory(
+        senderAccount._id.toString(),
+        "PremiumCredits PremiumCreditsFree ActiveAvatarImageType GiftsRemaining"
+    );
 
     if (senderInventory.GiftsRemaining == 0) {
         res.status(400).send("10").end();
@@ -58,20 +52,7 @@ export const giftingController: RequestHandler = async (req, res) => {
     }
     senderInventory.GiftsRemaining -= 1;
 
-    const inventoryChanges: IInventoryChanges = updateCurrency(
-        senderInventory,
-        data.PurchaseParams.ExpectedPrice,
-        true
-    );
-    if (data.PurchaseParams.StoreItem in ExportBundles) {
-        const bundle = ExportBundles[data.PurchaseParams.StoreItem];
-        if (bundle.giftingBonus) {
-            combineInventoryChanges(
-                inventoryChanges,
-                (await handleStoreItemAcquisition(bundle.giftingBonus, senderInventory)).InventoryChanges
-            );
-        }
-    }
+    updateCurrency(senderInventory, data.PurchaseParams.ExpectedPrice, true);
     await senderInventory.save();
 
     const senderName = getSuffixedName(senderAccount);
@@ -90,7 +71,7 @@ export const giftingController: RequestHandler = async (req, res) => {
                 }
             ],
             sub: "/Lotus/Language/Menu/GiftReceivedSubject",
-            icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
+            icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
             gifts: [
                 {
                     GiftType: data.PurchaseParams.StoreItem
@@ -99,9 +80,7 @@ export const giftingController: RequestHandler = async (req, res) => {
         }
     ]);
 
-    res.json({
-        InventoryChanges: inventoryChanges
-    });
+    res.end();
 };
 
 interface IGiftingRequest {

src/controllers/api/guildTechController.ts

@@ -104,7 +104,7 @@ export const guildTechController: RequestHandler = async (req, res) => {
                 ) {
                     throw new Error(`unexpected TechProductCategory: ${data.TechProductCategory}`);
                 }
-                if (!inventory[getSalvageCategory(data.TechProductCategory)].id(data.CategoryItemId!)) {
+                if (!inventory[getSalvageCategory(data.TechProductCategory)].id(data.CategoryItemId)) {
                     throw new Error(
                         `no item with id ${data.CategoryItemId} in ${getSalvageCategory(data.TechProductCategory)} array`
                     );
@@ -441,9 +441,16 @@ const finishComponentRepair = (
     const inventoryChanges = {
         ...(category == "CrewShipWeaponSkins"
             ? addCrewShipWeaponSkin(inventory, salvageItem.ItemType, salvageItem.UpgradeFingerprint)
-            : addEquipment(inventory, category, salvageItem.ItemType, {
-                  UpgradeFingerprint: salvageItem.UpgradeFingerprint
-              })),
+            : addEquipment(
+                  inventory,
+                  category,
+                  salvageItem.ItemType,
+                  undefined,
+                  {},
+                  {
+                      UpgradeFingerprint: salvageItem.UpgradeFingerprint
+                  }
+              )),
         ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, false)
     };
 

src/controllers/api/hostSessionController.ts

@@ -1,24 +1,17 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { createNewSession } from "@/src/managers/sessionManager";
 import { logger } from "@/src/utils/logger";
 import { ISession } from "@/src/types/session";
-import { JSONParse } from "json-with-bigint";
-import { toOid2, version_compare } from "@/src/helpers/inventoryHelpers";
 
 const hostSessionController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    const hostSessionRequest = JSONParse(String(req.body)) as ISession;
+    const accountId = await getAccountIdForRequest(req);
+    const hostSessionRequest = JSON.parse(req.body as string) as ISession;
     logger.debug("HostSession Request", { hostSessionRequest });
-    const session = createNewSession(hostSessionRequest, account._id);
+    const session = createNewSession(hostSessionRequest, accountId);
     logger.debug(`New Session Created`, { session });
 
-    if (account.BuildLabel && version_compare(account.BuildLabel, "2015.03.21.08.17") < 0) {
-        // U15 or below
-        res.send(session.sessionId.toString());
-    } else {
-        res.json({ sessionId: toOid2(session.sessionId, account.BuildLabel), rewardSeed: 99999999 });
-    }
+    res.json({ sessionId: { $oid: session.sessionId }, rewardSeed: 99999999 });
 };
 
 export { hostSessionController };

src/controllers/api/inboxController.ts

@@ -9,17 +9,10 @@ import {
     getMessage
 } from "@/src/services/inboxService";
 import { getAccountForRequest, getAccountFromSuffixedName, getSuffixedName } from "@/src/services/loginService";
-import {
-    addItems,
-    combineInventoryChanges,
-    getEffectiveAvatarImageType,
-    getInventory
-} from "@/src/services/inventoryService";
+import { addItems, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
-import { ExportFlavour } from "warframe-public-export-plus";
+import { ExportFlavour, ExportGear } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { fromStoreItem, isStoreItem } from "@/src/services/itemDataService";
-import { IOid } from "@/src/types/commonTypes";
 
 export const inboxController: RequestHandler = async (req, res) => {
     const { deleteId, lastMessage: latestClientMessageId, messageId } = req.query;
@@ -34,10 +27,10 @@ export const inboxController: RequestHandler = async (req, res) => {
             return;
         }
 
-        await deleteMessageRead(parseOid(deleteId as string));
+        await deleteMessageRead(deleteId as string);
         res.status(200).end();
     } else if (messageId) {
-        const message = await getMessage(parseOid(messageId as string));
+        const message = await getMessage(messageId as string);
         message.r = true;
         await message.save();
 
@@ -55,8 +48,8 @@ export const inboxController: RequestHandler = async (req, res) => {
             await addItems(
                 inventory,
                 attachmentItems.map(attItem => ({
-                    ItemType: isStoreItem(attItem) ? fromStoreItem(attItem) : attItem,
-                    ItemCount: 1
+                    ItemType: attItem,
+                    ItemCount: attItem in ExportGear ? (ExportGear[attItem].purchaseQuantity ?? 1) : 1
                 })),
                 inventoryChanges
             );
@@ -93,7 +86,7 @@ export const inboxController: RequestHandler = async (req, res) => {
                                 }
                             ],
                             sub: "/Lotus/Language/Menu/GiftReceivedConfirmationSubject",
-                            icon: ExportFlavour[getEffectiveAvatarImageType(inventory)].icon,
+                            icon: ExportFlavour[inventory.ActiveAvatarImageType].icon,
                             highPriority: true
                         }
                     ]);
@@ -106,7 +99,7 @@ export const inboxController: RequestHandler = async (req, res) => {
         await createNewEventMessages(req);
         const messages = await Inbox.find({ ownerId: accountId }).sort({ date: 1 });
 
-        const latestClientMessage = messages.find(m => m._id.toString() === parseOid(latestClientMessageId as string));
+        const latestClientMessage = messages.find(m => m._id.toString() === latestClientMessageId);
 
         if (!latestClientMessage) {
             logger.debug(`this should only happen after DeleteAllRead `);
@@ -129,11 +122,3 @@ export const inboxController: RequestHandler = async (req, res) => {
         res.json({ Inbox: inbox });
     }
 };
-
-// 33.6.0 has query arguments like lastMessage={"$oid":"68112baebf192e786d1502bb"} instead of lastMessage=68112baebf192e786d1502bb
-const parseOid = (oid: string): string => {
-    if (oid[0] == "{") {
-        return (JSON.parse(oid) as IOid).$oid;
-    }
-    return oid;
-};

src/controllers/api/infestedFoundryController.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { getInventory, addMiscItems, updateCurrency, addRecipes, freeUpSlot } from "@/src/services/inventoryService";
 import { IOid } from "@/src/types/commonTypes";
@@ -12,7 +12,7 @@ import {
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { ExportMisc } from "warframe-public-export-plus";
 import { getRecipe } from "@/src/services/itemDataService";
-import { toMongoDate, version_compare } from "@/src/helpers/inventoryHelpers";
+import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { logger } from "@/src/utils/logger";
 import { colorToShard } from "@/src/helpers/shardHelper";
 import { config } from "@/src/services/configService";
@@ -23,12 +23,12 @@ import {
 } from "@/src/services/infestedFoundryService";
 
 export const infestedFoundryController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
     switch (req.query.mode) {
         case "s": {
             // shard installation
             const request = getJSONfromString<IShardInstallRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
             if (!suit.ArchonCrystalUpgrades || suit.ArchonCrystalUpgrades.length != 5) {
                 suit.ArchonCrystalUpgrades = [{}, {}, {}, {}, {}];
@@ -56,7 +56,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "x": {
             // shard removal
             const request = getJSONfromString<IShardUninstallRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
 
             const miscItemChanges: IMiscItem[] = [];
@@ -70,30 +70,19 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
                     ItemCount: 1
                 });
                 addMiscItems(inventory, miscItemChanges);
-
-                // consume resources
-                if (!config.infiniteHelminthMaterials) {
-                    let type: string;
-                    let count: number;
-                    if (account.BuildLabel && version_compare(account.BuildLabel, "2025.05.20.10.18") < 0) {
-                        // < 38.6.0
-                        type = "/Lotus/Types/Items/InfestedFoundry/HelminthBile";
-                        count = 300;
-                    } else {
-                        // >= 38.6.0
-                        type =
-                            archonCrystalRemovalResource[
-                                suit.ArchonCrystalUpgrades![request.Slot].Color!.replace("_MYTHIC", "")
-                            ];
-                        count = suit.ArchonCrystalUpgrades![request.Slot].Color!.indexOf("_MYTHIC") != -1 ? 300 : 150;
-                    }
-                    inventory.InfestedFoundry!.Resources!.find(x => x.ItemType == type)!.Count -= count;
-                }
             }
 
             // remove from suit
             suit.ArchonCrystalUpgrades![request.Slot] = {};
 
+            if (!config.infiniteHelminthMaterials) {
+                // remove bile
+                const bile = inventory.InfestedFoundry!.Resources!.find(
+                    x => x.ItemType == "/Lotus/Types/Items/InfestedFoundry/HelminthBile"
+                )!;
+                bile.Count -= 300;
+            }
+
             await inventory.save();
 
             const infestedFoundry = inventory.toJSON<IInventoryClient>().InfestedFoundry!;
@@ -110,7 +99,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "n": {
             // name the beast
             const request = getJSONfromString<IHelminthNameRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.Name = request.newName;
             await inventory.save();
@@ -133,7 +122,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
             }
 
             const request = getJSONfromString<IHelminthFeedRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.Resources ??= [];
 
@@ -229,7 +218,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "o": {
             // offerings update
             const request = getJSONfromString<IHelminthOfferingsUpdate>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.InvigorationIndex = request.OfferingsIndex;
             inventory.InfestedFoundry.InvigorationSuitOfferings = request.SuitTypes;
@@ -250,7 +239,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "a": {
             // subsume warframe
             const request = getJSONfromString<IHelminthSubsumeRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             const recipe = getRecipe(request.Recipe)!;
             if (!config.infiniteHelminthMaterials) {
                 for (const ingredient of recipe.secretIngredients!) {
@@ -300,7 +289,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
 
         case "r": {
             // rush subsume
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             const currencyChanges = updateCurrency(inventory, 50, true);
             const recipeChanges = handleSubsumeCompletion(inventory);
             await inventory.save();
@@ -318,7 +307,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
 
         case "u": {
             const request = getJSONfromString<IHelminthInvigorationRequest>(String(req.body));
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
             const upgradesExpiry = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
             suit.OffensiveUpgrade = request.OffensiveUpgradeType;
@@ -351,7 +340,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         }
 
         case "custom_unlockall": {
-            const inventory = await getInventory(account._id.toString());
+            const inventory = await getInventory(accountId);
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.XP ??= 0;
             if (151875_00 > inventory.InfestedFoundry.XP) {
@@ -450,12 +439,3 @@ const apetiteModel = (x: number): number => {
     }
     return 3;
 };
-
-const archonCrystalRemovalResource: Record<string, string> = {
-    ACC_RED: "/Lotus/Types/Items/InfestedFoundry/HelminthOxides",
-    ACC_YELLOW: "/Lotus/Types/Items/InfestedFoundry/HelminthBile",
-    ACC_BLUE: "/Lotus/Types/Items/InfestedFoundry/HelminthSynthetics",
-    ACC_GREEN: "/Lotus/Types/Items/InfestedFoundry/HelminthBiotics",
-    ACC_ORANGE: "/Lotus/Types/Items/InfestedFoundry/HelminthPheromones",
-    ACC_PURPLE: "/Lotus/Types/Items/InfestedFoundry/HelminthCalx"
-};

src/controllers/api/inventoryController.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { Inventory, TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
 import allDialogue from "@/static/fixed_responses/allDialogue.json";
@@ -18,22 +18,15 @@ import {
     addMiscItems,
     allDailyAffiliationKeys,
     cleanupInventory,
-    createLibraryDailyTask,
-    generateRewardSeed
+    createLibraryDailyTask
 } from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
 import { catBreadHash } from "@/src/helpers/stringHelpers";
-import { Types } from "mongoose";
-import { getNemesisManifest } from "@/src/helpers/nemesisHelpers";
-import { getPersonalRooms } from "@/src/services/personalRoomsService";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
-import { Ship } from "@/src/models/shipModel";
-import { toLegacyOid, version_compare } from "@/src/helpers/inventoryHelpers";
 
 export const inventoryController: RequestHandler = async (request, response) => {
-    const account = await getAccountForRequest(request);
+    const accountId = await getAccountIdForRequest(request);
 
-    const inventory = await Inventory.findOne({ accountOwnerId: account._id });
+    const inventory = await Inventory.findOne({ accountOwnerId: accountId });
 
     if (!inventory) {
         response.status(400).json({ error: "inventory was undefined" });
@@ -94,7 +87,7 @@ export const inventoryController: RequestHandler = async (request, response) =>
         cleanupInventory(inventory);
 
         inventory.NextRefill = new Date((Math.trunc(Date.now() / 86400000) + 1) * 86400000);
-        //await inventory.save();
+        await inventory.save();
     }
 
     if (
@@ -103,43 +96,23 @@ export const inventoryController: RequestHandler = async (request, response) =>
         new Date() >= inventory.InfestedFoundry.AbilityOverrideUnlockCooldown
     ) {
         handleSubsumeCompletion(inventory);
-        //await inventory.save();
+        await inventory.save();
     }
 
-    if (inventory.LastInventorySync) {
-        const lastSyncDuviriMood = Math.trunc(inventory.LastInventorySync.getTimestamp().getTime() / 7200000);
-        const currentDuviriMood = Math.trunc(Date.now() / 7200000);
-        if (lastSyncDuviriMood != currentDuviriMood) {
-            logger.debug(`refreshing duviri seed`);
-            if (!inventory.DuviriInfo) {
-                inventory.DuviriInfo = {
-                    Seed: generateRewardSeed(),
-                    NumCompletions: 0
-                };
-            } else {
-                inventory.DuviriInfo.Seed = generateRewardSeed();
-            }
-        }
-    }
-    inventory.LastInventorySync = new Types.ObjectId();
-    await inventory.save();
-
-    response.json(
-        await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query, account.BuildLabel)
-    );
+    response.json(await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query));
 };
 
 export const getInventoryResponse = async (
     inventory: TInventoryDatabaseDocument,
-    xpBasedLevelCapDisabled: boolean,
-    buildLabel: string | undefined
+    xpBasedLevelCapDisabled: boolean
 ): Promise<IInventoryClient> => {
-    const [inventoryWithLoadOutPresets, ships] = await Promise.all([
-        inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>("LoadOutPresets"),
-        Ship.find({ ShipOwnerId: inventory.accountOwnerId })
-    ]);
-    const inventoryResponse = inventoryWithLoadOutPresets.toJSON<IInventoryClient>();
-    inventoryResponse.Ships = ships.map(x => x.toJSON<IShipInventory>());
+    const inventoryWithLoadOutPresets = await inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>(
+        "LoadOutPresets"
+    );
+    const inventoryWithLoadOutPresetsAndShips = await inventoryWithLoadOutPresets.populate<{ Ships: IShipInventory }>(
+        "Ships"
+    );
+    const inventoryResponse = inventoryWithLoadOutPresetsAndShips.toJSON<IInventoryClient>();
 
     if (config.infiniteCredits) {
         inventoryResponse.RegularCredits = 999999999;
@@ -301,49 +274,16 @@ export const getInventoryResponse = async (
     }
 
     // Omitting this field so opening the navigation resyncs the inventory which is more desirable for typical usage.
-    inventoryResponse.LastInventorySync = undefined;
+    //inventoryResponse.LastInventorySync = toOid(new Types.ObjectId());
 
     // Set 2FA enabled so trading post can be used
     inventoryResponse.HWIDProtectEnabled = true;
 
-    if (buildLabel) {
-        // Fix nemesis for older versions
-        if (
-            inventoryResponse.Nemesis &&
-            version_compare(buildLabel, getNemesisManifest(inventoryResponse.Nemesis.manifest).minBuild) < 0
-        ) {
-            inventoryResponse.Nemesis = undefined;
-        }
-
-        if (version_compare(buildLabel, "2018.02.22.14.34") < 0) {
-            const personalRoomsDb = await getPersonalRooms(inventory.accountOwnerId.toString());
-            const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
-            inventoryResponse.Ship = personalRooms.Ship;
-
-            if (version_compare(buildLabel, "2016.12.21.19.13") <= 0) {
-                // U19.5 and below use $id instead of $oid
-                for (const category of equipmentKeys) {
-                    for (const item of inventoryResponse[category]) {
-                        toLegacyOid(item.ItemId);
-                    }
-                }
-                for (const upgrade of inventoryResponse.Upgrades) {
-                    toLegacyOid(upgrade.ItemId);
-                }
-                if (inventoryResponse.BrandedSuits) {
-                    for (const id of inventoryResponse.BrandedSuits) {
-                        toLegacyOid(id);
-                    }
-                }
-            }
-        }
-    }
-
     return inventoryResponse;
 };
 
 const addString = (arr: string[], str: string): void => {
-    if (arr.indexOf(str) == -1) {
+    if (!arr.find(x => x == str)) {
         arr.push(str);
     }
 };

src/controllers/api/loginController.ts

@@ -7,7 +7,6 @@ import { Account } from "@/src/models/loginModel";
 import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
 import { IDatabaseAccountJson, ILoginRequest, ILoginResponse } from "@/src/types/loginTypes";
 import { logger } from "@/src/utils/logger";
-import { version_compare } from "@/src/helpers/inventoryHelpers";
 
 export const loginController: RequestHandler = async (request, response) => {
     const loginRequest = JSON.parse(String(request.body)) as ILoginRequest; // parse octet stream of json data to json object
@@ -20,27 +19,9 @@ export const loginController: RequestHandler = async (request, response) => {
             ? request.query.buildLabel.split(" ").join("+")
             : buildConfig.buildLabel;
 
-    let myAddress: string;
-    let myUrlBase: string = request.protocol + "://";
-    if (request.host.indexOf("warframe.com") == -1) {
-        // Client request was redirected cleanly, so we know it can reach us how it's reaching us now.
-        myAddress = request.hostname;
-        myUrlBase += request.host;
-    } else {
-        // Don't know how the client reached us, hoping the config does.
-        myAddress = config.myAddress;
-        myUrlBase += myAddress;
-        const port: number = request.protocol == "http" ? config.httpPort || 80 : config.httpsPort || 443;
-        if (port != (request.protocol == "http" ? 80 : 443)) {
-            myUrlBase += ":" + port;
-        }
-    }
+    const myAddress = request.host.indexOf("warframe.com") == -1 ? request.host : config.myAddress;
 
-    if (
-        !account &&
-        ((config.autoCreateAccount && loginRequest.ClientType != "webui") ||
-            loginRequest.ClientType == "webui-register")
-    ) {
+    if (!account && config.autoCreateAccount && loginRequest.ClientType != "webui") {
         try {
             const nameFromEmail = loginRequest.email.substring(0, loginRequest.email.indexOf("@"));
             let name = nameFromEmail || loginRequest.email.substring(1) || "SpaceNinja";
@@ -55,18 +36,16 @@ export const loginController: RequestHandler = async (request, response) => {
                 email: loginRequest.email,
                 password: loginRequest.password,
                 DisplayName: name,
-                CountryCode: loginRequest.lang?.toUpperCase() ?? "EN",
-                ClientType: loginRequest.ClientType == "webui-register" ? "webui" : loginRequest.ClientType,
+                CountryCode: loginRequest.lang.toUpperCase(),
+                ClientType: loginRequest.ClientType,
                 CrossPlatformAllowed: true,
                 ForceLogoutVersion: 0,
                 ConsentNeeded: false,
                 TrackedSettings: [],
-                Nonce: nonce,
-                BuildLabel: buildLabel,
-                LastLogin: new Date()
+                Nonce: nonce
             });
             logger.debug("created new account");
-            response.json(createLoginResponse(myAddress, myUrlBase, newAccount, buildLabel));
+            response.json(createLoginResponse(myAddress, newAccount, buildLabel));
             return;
         } catch (error: unknown) {
             if (error instanceof Error) {
@@ -80,11 +59,6 @@ export const loginController: RequestHandler = async (request, response) => {
         return;
     }
 
-    if (loginRequest.ClientType == "webui-register") {
-        response.status(400).json({ error: "account already exists" });
-        return;
-    }
-
     if (!isCorrectPassword(loginRequest.password, account.password)) {
         response.status(400).json({ error: "incorrect login data" });
         return;
@@ -97,72 +71,39 @@ export const loginController: RequestHandler = async (request, response) => {
         }
     } else {
         if (account.Nonce && account.ClientType != "webui" && !account.Dropped && !loginRequest.kick) {
-            // U17 seems to handle "nonce still set" like a login failure.
-            if (version_compare(buildLabel, "2015.12.05.18.07") >= 0) {
-                response.status(400).send({ error: "nonce still set" });
-                return;
-            }
+            response.status(400).json({ error: "nonce still set" });
+            return;
         }
 
         account.ClientType = loginRequest.ClientType;
         account.Nonce = nonce;
-        account.CountryCode = loginRequest.lang?.toUpperCase() ?? "EN";
-        account.BuildLabel = buildLabel;
-        account.LastLogin = new Date();
+        account.CountryCode = loginRequest.lang.toUpperCase();
     }
     await account.save();
 
-    response.json(createLoginResponse(myAddress, myUrlBase, account.toJSON(), buildLabel));
+    response.json(createLoginResponse(myAddress, account.toJSON(), buildLabel));
 };
 
-const createLoginResponse = (
-    myAddress: string,
-    myUrlBase: string,
-    account: IDatabaseAccountJson,
-    buildLabel: string
-): ILoginResponse => {
-    const resp: ILoginResponse = {
+const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, buildLabel: string): ILoginResponse => {
+    return {
         id: account.id,
         DisplayName: account.DisplayName,
         CountryCode: account.CountryCode,
+        ClientType: account.ClientType,
+        CrossPlatformAllowed: account.CrossPlatformAllowed,
+        ForceLogoutVersion: account.ForceLogoutVersion,
         AmazonAuthToken: account.AmazonAuthToken,
         AmazonRefreshToken: account.AmazonRefreshToken,
+        ConsentNeeded: account.ConsentNeeded,
+        TrackedSettings: account.TrackedSettings,
         Nonce: account.Nonce,
-        BuildLabel: buildLabel
+        Groups: [],
+        IRC: config.myIrcAddresses ?? [myAddress],
+        platformCDNs: [`https://${myAddress}/`],
+        HUB: `https://${myAddress}/api/`,
+        NRS: config.NRS,
+        DTLS: 99,
+        BuildLabel: buildLabel,
+        MatchmakingBuildId: buildConfig.matchmakingBuildId
     };
-    if (version_compare(buildLabel, "2015.02.13.10.41") >= 0) {
-        resp.NRS = config.NRS;
-    }
-    if (version_compare(buildLabel, "2015.05.14.16.29") >= 0) {
-        // U17 and up
-        resp.IRC = config.myIrcAddresses ?? [myAddress];
-    }
-    if (version_compare(buildLabel, "2018.11.08.14.45") >= 0) {
-        // U24 and up
-        resp.ConsentNeeded = account.ConsentNeeded;
-        resp.TrackedSettings = account.TrackedSettings;
-    }
-    if (version_compare(buildLabel, "2019.08.29.20.01") >= 0) {
-        // U25.7 and up
-        resp.ForceLogoutVersion = account.ForceLogoutVersion;
-    }
-    if (version_compare(buildLabel, "2019.10.31.22.42") >= 0) {
-        // U26 and up
-        resp.Groups = [];
-    }
-    if (version_compare(buildLabel, "2021.04.13.19.58") >= 0) {
-        resp.DTLS = 99;
-    }
-    if (version_compare(buildLabel, "2022.04.29.12.53") >= 0) {
-        resp.ClientType = account.ClientType;
-    }
-    if (version_compare(buildLabel, "2022.09.06.19.24") >= 0) {
-        resp.CrossPlatformAllowed = account.CrossPlatformAllowed;
-        resp.HUB = `${myUrlBase}/api/`;
-        resp.MatchmakingBuildId = buildConfig.matchmakingBuildId;
-    }
-    if (version_compare(buildLabel, "2023.04.25.23.40") >= 0) {
-        resp.platformCDNs = [`${myUrlBase}/`];
-    }
-    return resp;
 };

src/controllers/api/loginRewardsSelectionController.ts

@@ -26,7 +26,7 @@ export const loginRewardsSelectionController: RequestHandler = async (req, res)
             StoreItemType: body.ChosenReward
         };
         inventoryChanges = (await handleStoreItemAcquisition(body.ChosenReward, inventory)).InventoryChanges;
-        if (evergreenRewards.indexOf(body.ChosenReward) == -1) {
+        if (!evergreenRewards.find(x => x == body.ChosenReward)) {
             inventory.LoginMilestoneRewards.push(body.ChosenReward);
         }
     } else {

src/controllers/api/missionInventoryUpdateController.ts

@@ -1,9 +1,9 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes";
 import { addMissionInventoryUpdates, addMissionRewards } from "@/src/services/missionInventoryUpdateService";
-import { generateRewardSeed, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getInventoryResponse } from "./inventoryController";
 import { logger } from "@/src/utils/logger";
 import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes";
@@ -49,29 +49,22 @@ import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes";
 */
 //move credit calc in here, return MissionRewards: [] if no reward info
 export const missionInventoryUpdateController: RequestHandler = async (req, res): Promise<void> => {
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
     const missionReport = getJSONfromString<IMissionInventoryUpdateRequest>((req.body as string).toString());
     logger.debug("mission report:", missionReport);
 
-    const inventory = await getInventory(account._id.toString());
+    const inventory = await getInventory(accountId);
     const firstCompletion = missionReport.SortieId
         ? inventory.CompletedSorties.indexOf(missionReport.SortieId) == -1
         : false;
-    const inventoryUpdates = await addMissionInventoryUpdates(account, inventory, missionReport);
+    const inventoryUpdates = await addMissionInventoryUpdates(inventory, missionReport);
 
     if (
         missionReport.MissionStatus !== "GS_SUCCESS" &&
-        !(
-            missionReport.RewardInfo?.jobId ||
-            missionReport.RewardInfo?.challengeMissionId ||
-            missionReport.RewardInfo?.T
-        )
+        !(missionReport.RewardInfo?.jobId || missionReport.RewardInfo?.challengeMissionId)
     ) {
-        if (missionReport.EndOfMatchUpload) {
-            inventory.RewardSeed = generateRewardSeed();
-        }
         await inventory.save();
-        const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
+        const inventoryResponse = await getInventoryResponse(inventory, true);
         res.json({
             InventoryJson: JSON.stringify(inventoryResponse),
             MissionRewards: []
@@ -88,11 +81,8 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         ConquestCompletedMissionsCount
     } = await addMissionRewards(inventory, missionReport, firstCompletion);
 
-    if (missionReport.EndOfMatchUpload) {
-        inventory.RewardSeed = generateRewardSeed();
-    }
     await inventory.save();
-    const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
+    const inventoryResponse = await getInventoryResponse(inventory, true);
 
     //TODO: figure out when to send inventory. it is needed for many cases.
     res.json({

src/controllers/api/modularWeaponCraftingController.ts

@@ -17,7 +17,7 @@ import { getDefaultUpgrades } from "@/src/services/itemDataService";
 import { modularWeaponTypes } from "@/src/helpers/modularWeaponHelper";
 import { IEquipmentDatabase } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { getRandomInt } from "@/src/services/rngService";
-import { ExportSentinels, ExportWeapons, IDefaultUpgrade } from "warframe-public-export-plus";
+import { ExportSentinels, IDefaultUpgrade } from "warframe-public-export-plus";
 import { Status } from "@/src/types/inventoryTypes/inventoryTypes";
 
 interface IModularCraftRequest {
@@ -36,9 +36,7 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     const inventory = await getInventory(accountId);
 
     let defaultUpgrades: IDefaultUpgrade[] | undefined;
-    const defaultOverwrites: Partial<IEquipmentDatabase> = {
-        ModularParts: data.Parts
-    };
+    const defaultOverwrites: Partial<IEquipmentDatabase> = {};
     const inventoryChanges: IInventoryChanges = {};
     if (category == "KubrowPets") {
         const traits = {
@@ -140,20 +138,8 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     } else {
         defaultUpgrades = getDefaultUpgrades(data.Parts);
     }
-
-    if (category == "MoaPets") {
-        const weapon = ExportSentinels[data.WeaponType].defaultWeapon;
-        if (weapon) {
-            const category = ExportWeapons[weapon].productCategory;
-            addEquipment(inventory, category, weapon, undefined, inventoryChanges);
-            combineInventoryChanges(
-                inventoryChanges,
-                occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)
-            );
-        }
-    }
     defaultOverwrites.Configs = applyDefaultUpgrades(inventory, defaultUpgrades);
-    addEquipment(inventory, category, data.WeaponType, defaultOverwrites, inventoryChanges);
+    addEquipment(inventory, category, data.WeaponType, data.Parts, inventoryChanges, defaultOverwrites);
     combineInventoryChanges(
         inventoryChanges,
         occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)

src/controllers/api/modularWeaponSaleController.ts

@@ -2,7 +2,7 @@ import { RequestHandler } from "express";
 import { ExportWeapons } from "warframe-public-export-plus";
 import { IMongoDate } from "@/src/types/commonTypes";
 import { toMongoDate } from "@/src/helpers/inventoryHelpers";
-import { SRng } from "@/src/services/rngService";
+import { CRng } from "@/src/services/rngService";
 import { ArtifactPolarity, EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import {
@@ -21,11 +21,7 @@ import { IInventoryChanges } from "@/src/types/purchaseTypes";
 export const modularWeaponSaleController: RequestHandler = async (req, res) => {
     const partTypeToParts: Record<string, string[]> = {};
     for (const [uniqueName, data] of Object.entries(ExportWeapons)) {
-        if (
-            data.partType &&
-            data.premiumPrice &&
-            !data.excludeFromCodex // exclude pvp variants
-        ) {
+        if (data.partType && data.premiumPrice) {
             partTypeToParts[data.partType] ??= [];
             partTypeToParts[data.partType].push(uniqueName);
         }
@@ -45,18 +41,24 @@ export const modularWeaponSaleController: RequestHandler = async (req, res) => {
         const defaultUpgrades = getDefaultUpgrades(weaponInfo.ModularParts);
         const configs = applyDefaultUpgrades(inventory, defaultUpgrades);
         const inventoryChanges: IInventoryChanges = {
-            ...addEquipment(inventory, category, weaponInfo.ItemType, {
-                Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
-                ItemName: payload.ItemName,
-                Configs: configs,
-                ModularParts: weaponInfo.ModularParts,
-                Polarity: [
-                    {
-                        Slot: payload.PolarizeSlot,
-                        Value: payload.PolarizeValue
-                    }
-                ]
-            }),
+            ...addEquipment(
+                inventory,
+                category,
+                weaponInfo.ItemType,
+                weaponInfo.ModularParts,
+                {},
+                {
+                    Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
+                    ItemName: payload.ItemName,
+                    Configs: configs,
+                    Polarity: [
+                        {
+                            Slot: payload.PolarizeSlot,
+                            Value: payload.PolarizeValue
+                        }
+                    ]
+                }
+            ),
             ...occupySlot(inventory, productCategoryToInventoryBin(category)!, true),
             ...updateCurrency(inventory, weaponInfo.PremiumPrice, true)
         };
@@ -140,8 +142,8 @@ const getModularWeaponSale = (
     partTypes: string[],
     getItemType: (parts: string[]) => string
 ): IModularWeaponSaleInfo => {
-    const rng = new SRng(day);
-    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType])!);
+    const rng = new CRng(day);
+    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType]));
     let partsCost = 0;
     for (const part of parts) {
         partsCost += ExportWeapons[part].premiumPrice!;

src/controllers/api/nemesisController.ts

@@ -1,46 +1,33 @@
-import { version_compare } from "@/src/helpers/inventoryHelpers";
 import {
     consumeModCharge,
-    decodeNemesisGuess,
     encodeNemesisGuess,
     getInfNodes,
-    getKnifeUpgrade,
-    getNemesisManifest,
     getNemesisPasscode,
-    getNemesisPasscodeModTypes,
-    GUESS_CORRECT,
-    GUESS_INCORRECT,
-    GUESS_NEUTRAL,
-    GUESS_NONE,
-    GUESS_WILDCARD,
     IKnifeResponse
 } from "@/src/helpers/nemesisHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Loadout } from "@/src/models/inventoryModels/loadoutModel";
 import { freeUpSlot, getInventory } from "@/src/services/inventoryService";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { SRng } from "@/src/services/rngService";
 import { IMongoDate, IOid } from "@/src/types/commonTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import {
     IInnateDamageFingerprint,
-    IInventoryClient,
-    INemesisClient,
     InventorySlot,
     IUpgradeClient,
     IWeaponSkinClient,
     LoadoutIndex,
-    TEquipmentKey,
-    TNemesisFaction
+    TEquipmentKey
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 
 export const nemesisController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
     if ((req.query.mode as string) == "f") {
         const body = getJSONfromString<IValenceFusionRequest>(String(req.body));
-        const inventory = await getInventory(account._id.toString(), body.Category + " WeaponBin");
+        const inventory = await getInventory(accountId, body.Category + " WeaponBin");
         const destWeapon = inventory[body.Category].id(body.DestWeapon.$oid)!;
         const sourceWeapon = inventory[body.Category].id(body.SourceWeapon.$oid)!;
         const destFingerprint = JSON.parse(destWeapon.UpgradeFingerprint!) as IInnateDamageFingerprint;
@@ -75,7 +62,7 @@ export const nemesisController: RequestHandler = async (req, res) => {
             }
         });
     } else if ((req.query.mode as string) == "p") {
-        const inventory = await getInventory(account._id.toString(), "Nemesis");
+        const inventory = await getInventory(accountId, "Nemesis");
         const body = getJSONfromString<INemesisPrespawnCheckRequest>(String(req.body));
         const passcode = getNemesisPasscode(inventory.Nemesis!);
         let guessResult = 0;
@@ -88,7 +75,7 @@ export const nemesisController: RequestHandler = async (req, res) => {
             }
         } else {
             for (let i = 0; i != 3; ++i) {
-                if (body.guess[i] == passcode[i] || body.guess[i] == GUESS_WILDCARD) {
+                if (body.guess[i] == passcode[i]) {
                     ++guessResult;
                 }
             }
@@ -96,154 +83,114 @@ export const nemesisController: RequestHandler = async (req, res) => {
         res.json({ GuessResult: guessResult });
     } else if (req.query.mode == "r") {
         const inventory = await getInventory(
-            account._id.toString(),
+            accountId,
             "Nemesis LoadOutPresets CurrentLoadOutIds DataKnives Upgrades RawUpgrades"
         );
         const body = getJSONfromString<INemesisRequiemRequest>(String(req.body));
         if (inventory.Nemesis!.Faction == "FC_INFESTATION") {
             const guess: number[] = [body.guess & 0xf, (body.guess >> 4) & 0xf, (body.guess >> 8) & 0xf];
             const passcode = getNemesisPasscode(inventory.Nemesis!)[0];
-            const result1 = passcode == guess[0] ? GUESS_CORRECT : GUESS_INCORRECT;
-            const result2 = passcode == guess[1] ? GUESS_CORRECT : GUESS_INCORRECT;
-            const result3 = passcode == guess[2] ? GUESS_CORRECT : GUESS_INCORRECT;
+
+            // Add to GuessHistory
+            const result1 = passcode == guess[0] ? 0 : 1;
+            const result2 = passcode == guess[1] ? 0 : 1;
+            const result3 = passcode == guess[2] ? 0 : 1;
             inventory.Nemesis!.GuessHistory.push(
-                encodeNemesisGuess([
-                    {
-                        symbol: guess[0],
-                        result: result1
-                    },
-                    {
-                        symbol: guess[1],
-                        result: result2
-                    },
-                    {
-                        symbol: guess[2],
-                        result: result3
-                    }
-                ])
+                encodeNemesisGuess(guess[0], result1, guess[1], result2, guess[2], result3)
             );
 
-            // Increase antivirus if correct antivirus mod is installed
+            // Increase antivirus
+            let antivirusGain = 5;
+            const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
+            const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
+            const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
+            const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
             const response: IKnifeResponse = {};
-            if (result1 == GUESS_CORRECT || result2 == GUESS_CORRECT || result3 == GUESS_CORRECT) {
-                let antivirusGain = 5;
-                const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
-                const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
-                const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
-                const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
-                for (const upgrade of body.knife!.AttachedUpgrades) {
-                    switch (upgrade.ItemType) {
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
-                            antivirusGain += 15;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
-                            antivirusGain += 15;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                    }
+            for (const upgrade of body.knife!.AttachedUpgrades) {
+                switch (upgrade.ItemType) {
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
+                        antivirusGain += 15;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
+                        antivirusGain += 15;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
                 }
-                inventory.Nemesis!.HenchmenKilled += antivirusGain;
             }
-
+            inventory.Nemesis!.HenchmenKilled += antivirusGain;
             if (inventory.Nemesis!.HenchmenKilled >= 100) {
                 inventory.Nemesis!.HenchmenKilled = 100;
+                inventory.Nemesis!.InfNodes = [
+                    {
+                        Node: "CrewBattleNode559",
+                        Influence: 1
+                    }
+                ];
+                inventory.Nemesis!.Weakened = true;
+            } else {
+                inventory.Nemesis!.InfNodes = getInfNodes("FC_INFESTATION", 0);
             }
-            inventory.Nemesis!.InfNodes = getInfNodes(getNemesisManifest(inventory.Nemesis!.manifest), 0);
 
             await inventory.save();
             res.json(response);
         } else {
-            // For first guess, create a new entry.
-            if (body.position == 0) {
-                inventory.Nemesis!.GuessHistory.push(
-                    encodeNemesisGuess([
-                        {
-                            symbol: GUESS_NONE,
-                            result: GUESS_NEUTRAL
-                        },
-                        {
-                            symbol: GUESS_NONE,
-                            result: GUESS_NEUTRAL
-                        },
-                        {
-                            symbol: GUESS_NONE,
-                            result: GUESS_NEUTRAL
-                        }
-                    ])
-                );
+            const passcode = getNemesisPasscode(inventory.Nemesis!);
+            if (passcode[body.position] != body.guess) {
+                res.end();
+            } else {
+                inventory.Nemesis!.Rank += 1;
+                inventory.Nemesis!.InfNodes = getInfNodes(inventory.Nemesis!.Faction, inventory.Nemesis!.Rank);
+                await inventory.save();
+                res.json({ RankIncrease: 1 });
             }
-
-            // Evaluate guess
-            const correct =
-                body.guess == GUESS_WILDCARD || getNemesisPasscode(inventory.Nemesis!)[body.position] == body.guess;
-
-            // Update entry
-            const guess = decodeNemesisGuess(
-                inventory.Nemesis!.GuessHistory[inventory.Nemesis!.GuessHistory.length - 1]
-            );
-            guess[body.position].symbol = body.guess;
-            guess[body.position].result = correct ? GUESS_CORRECT : GUESS_INCORRECT;
-            inventory.Nemesis!.GuessHistory[inventory.Nemesis!.GuessHistory.length - 1] = encodeNemesisGuess(guess);
-
-            // Increase rank if incorrect
-            let RankIncrease: number | undefined;
-            if (!correct) {
-                RankIncrease = 1;
-                const manifest = getNemesisManifest(inventory.Nemesis!.manifest);
-                inventory.Nemesis!.Rank = Math.min(inventory.Nemesis!.Rank + 1, manifest.systemIndexes.length - 1);
-                inventory.Nemesis!.InfNodes = getInfNodes(manifest, inventory.Nemesis!.Rank);
-            }
-            await inventory.save();
-            res.json({ RankIncrease });
         }
     } else if ((req.query.mode as string) == "rs") {
         // report spawn; POST but no application data in body
-        const inventory = await getInventory(account._id.toString(), "Nemesis");
+        const inventory = await getInventory(accountId, "Nemesis");
         inventory.Nemesis!.LastEnc = inventory.Nemesis!.MissionCount;
         await inventory.save();
         res.json({ LastEnc: inventory.Nemesis!.LastEnc });
     } else if ((req.query.mode as string) == "s") {
-        const inventory = await getInventory(account._id.toString(), "Nemesis");
-        if (inventory.Nemesis) {
-            logger.warn(`overwriting an existing nemesis as a new one is being requested`);
-        }
+        const inventory = await getInventory(accountId, "Nemesis");
         const body = getJSONfromString<INemesisStartRequest>(String(req.body));
         body.target.fp = BigInt(body.target.fp);
 
-        const manifest = getNemesisManifest(body.target.manifest);
-        if (account.BuildLabel && version_compare(account.BuildLabel, manifest.minBuild) < 0) {
-            logger.warn(
-                `client on version ${account.BuildLabel} provided nemesis manifest ${body.target.manifest} which was expected to require ${manifest.minBuild} or above. please file a bug report.`
-            );
-        }
-
         let weaponIdx = -1;
         if (body.target.Faction != "FC_INFESTATION") {
-            const weapons: readonly string[] = manifest.weapons;
+            let weapons: readonly string[];
+            if (body.target.manifest == "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix") {
+                weapons = kuvaLichVersionSixWeapons;
+            } else if (
+                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour" ||
+                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree"
+            ) {
+                weapons = corpusVersionThreeWeapons;
+            } else {
+                throw new Error(`unknown nemesis manifest: ${body.target.manifest}`);
+            }
+
             const initialWeaponIdx = new SRng(body.target.fp).randomInt(0, weapons.length - 1);
             weaponIdx = initialWeaponIdx;
-            if (body.target.DisallowedWeapons) {
-                do {
-                    const weapon = weapons[weaponIdx];
-                    if (body.target.DisallowedWeapons.indexOf(weapon) == -1) {
-                        break;
-                    }
-                    weaponIdx = (weaponIdx + 1) % weapons.length;
-                } while (weaponIdx != initialWeaponIdx);
-            }
+            do {
+                const weapon = weapons[weaponIdx];
+                if (!body.target.DisallowedWeapons.find(x => x == weapon)) {
+                    break;
+                }
+                weaponIdx = (weaponIdx + 1) % weapons.length;
+            } while (weaponIdx != initialWeaponIdx);
         }
 
         inventory.Nemesis = {
@@ -260,14 +207,14 @@ export const nemesisController: RequestHandler = async (req, res) => {
             k: false,
             Traded: false,
             d: new Date(),
-            InfNodes: getInfNodes(manifest, 0),
+            InfNodes: getInfNodes(body.target.Faction, 0),
             GuessHistory: [],
             Hints: [],
             HintProgress: 0,
-            Weakened: false,
+            Weakened: body.target.Weakened,
             PrevOwners: 0,
             HenchmenKilled: 0,
-            SecondInCommand: false,
+            SecondInCommand: body.target.SecondInCommand,
             MissionCount: 0,
             LastEnc: 0
         };
@@ -276,38 +223,6 @@ export const nemesisController: RequestHandler = async (req, res) => {
         res.json({
             target: inventory.toJSON().Nemesis
         });
-    } else if ((req.query.mode as string) == "w") {
-        const inventory = await getInventory(
-            account._id.toString(),
-            "Nemesis LoadOutPresets CurrentLoadOutIds DataKnives Upgrades RawUpgrades"
-        );
-        //const body = getJSONfromString<INemesisWeakenRequest>(String(req.body));
-
-        inventory.Nemesis!.InfNodes = [
-            {
-                Node: getNemesisManifest(inventory.Nemesis!.manifest).showdownNode,
-                Influence: 1
-            }
-        ];
-        inventory.Nemesis!.Weakened = true;
-
-        const response: IKnifeResponse & { target: INemesisClient } = {
-            target: inventory.toJSON<IInventoryClient>().Nemesis!
-        };
-
-        // Consume charge of the correct requiem mod(s)
-        const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
-        const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
-        const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
-        const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
-        const modTypes = getNemesisPasscodeModTypes(inventory.Nemesis!);
-        for (const modType of modTypes) {
-            const upgrade = getKnifeUpgrade(inventory, dataknifeUpgrades, modType);
-            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-        }
-
-        await inventory.save();
-        res.json(response);
     } else {
         logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
         throw new Error(`unknown nemesis mode: ${String(req.query.mode)}`);
@@ -328,11 +243,11 @@ interface INemesisStartRequest {
         KillingSuit: string;
         killingDamageType: number;
         ShoulderHelmet: string;
-        DisallowedWeapons?: string[];
+        DisallowedWeapons: string[];
         WeaponIdx: number;
         AgentIdx: number;
         BirthNode: string;
-        Faction: TNemesisFaction;
+        Faction: string;
         Rank: number;
         k: boolean;
         Traded: boolean;
@@ -359,19 +274,48 @@ interface INemesisRequiemRequest {
     guess: number; // grn/crp: 4 bits | coda: 3x 4 bits
     position: number; // grn/crp: 0-2 | coda: 0
     // knife field provided for coda only
-    knife?: IKnife;
+    knife?: {
+        Item: IEquipmentClient;
+        Skins: IWeaponSkinClient[];
+        ModSlot: number;
+        CustSlot: number;
+        AttachedUpgrades: IUpgradeClient[];
+        HiddenWhenHolstered: boolean;
+    };
 }
 
-// interface INemesisWeakenRequest {
-//     target: INemesisClient;
-//     knife: IKnife;
-// }
+const kuvaLichVersionSixWeapons = [
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
+    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
+    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
+    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
+    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
+    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
+];
 
-interface IKnife {
-    Item: IEquipmentClient;
-    Skins: IWeaponSkinClient[];
-    ModSlot: number;
-    CustSlot: number;
-    AttachedUpgrades: IUpgradeClient[];
-    HiddenWhenHolstered: boolean;
-}
+const corpusVersionThreeWeapons = [
+    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
+    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
+    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
+];

src/controllers/api/placeDecoInComponentController.ts

@@ -37,7 +37,6 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
         const deco = component.Decos.find(x => x._id.equals(request.MoveId))!;
         deco.Pos = request.Pos;
         deco.Rot = request.Rot;
-        deco.Scale = request.Scale;
     } else {
         const deco =
             component.Decos[
@@ -46,7 +45,6 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
                     Type: request.Type,
                     Pos: request.Pos,
                     Rot: request.Rot,
-                    Scale: request.Scale,
                     Name: request.Name,
                     Sockets: request.Sockets
                 }) - 1
@@ -115,9 +113,9 @@ interface IPlaceDecoInComponentRequest {
     Type: string;
     Pos: number[];
     Rot: number[];
-    Scale?: number;
     Name?: string;
     Sockets?: number;
+    Scale?: number; // only provided alongside MoveId and seems to always be 1
     MoveId?: string;
     ShipDeco?: boolean;
     VaultDeco?: boolean;

src/controllers/api/projectionManagerController.ts

@@ -2,16 +2,13 @@ import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { addMiscItems, getInventory } from "@/src/services/inventoryService";
 import { ExportRelics, IRelic } from "warframe-public-export-plus";
-import { config } from "@/src/services/configService";
 
 export const projectionManagerController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
     const inventory = await getInventory(accountId);
     const request = JSON.parse(String(req.body)) as IProjectionUpgradeRequest;
     const [era, category, currentQuality] = parseProjection(request.projectionType);
-    const upgradeCost = config.dontSubtractVoidTraces
-        ? 0
-        : (request.qualityTag - qualityKeywordToNumber[currentQuality]) * 25;
+    const upgradeCost = (request.qualityTag - qualityKeywordToNumber[currentQuality]) * 25;
     const newProjectionType = findProjection(era, category, qualityNumberToKeyword[request.qualityTag]);
     addMiscItems(inventory, [
         {

src/controllers/api/questControlController.ts

@@ -1,25 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-// Basic shim handling action=sync to login on U21
-export const questControlController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const quests: IQuestState[] = [];
-    for (const quest of inventory.QuestKeys) {
-        quests.push({
-            quest: quest.ItemType,
-            state: 3 // COMPLETE
-        });
-    }
-    res.json({
-        QuestState: quests
-    });
-};
-
-interface IQuestState {
-    quest: string;
-    state: number;
-    task?: string;
-}

src/controllers/api/removeFriendController.ts

@@ -1,99 +0,0 @@
-import { toOid } from "@/src/helpers/inventoryHelpers";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { Friendship } from "@/src/models/friendModel";
-import { Account } from "@/src/models/loginModel";
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IOid } from "@/src/types/commonTypes";
-import { parallelForeach } from "@/src/utils/async-utils";
-import { RequestHandler } from "express";
-import { Types } from "mongoose";
-
-export const removeFriendGetController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    if (req.query.all) {
-        const [internalFriendships, externalFriendships] = await Promise.all([
-            Friendship.find({ owner: accountId }, "friend"),
-            Friendship.find({ friend: accountId }, "owner")
-        ]);
-        const promises: Promise<void>[] = [];
-        const friends: IOid[] = [];
-        for (const externalFriendship of externalFriendships) {
-            if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
-                promises.push(Friendship.deleteOne({ _id: externalFriendship._id }) as unknown as Promise<void>);
-                friends.push(toOid(externalFriendship.owner));
-            }
-        }
-        await Promise.all(promises);
-        res.json({
-            Friends: friends
-        } satisfies IRemoveFriendsResponse);
-    } else {
-        const friendId = req.query.friendId as string;
-        await Promise.all([
-            Friendship.deleteOne({ owner: accountId, friend: friendId }),
-            Friendship.deleteOne({ owner: friendId, friend: accountId })
-        ]);
-        res.json({
-            Friends: [{ $oid: friendId }]
-        } satisfies IRemoveFriendsResponse);
-    }
-};
-
-export const removeFriendPostController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const data = getJSONfromString<IBatchRemoveFriendsRequest>(String(req.body));
-    const friends = new Set((await Friendship.find({ owner: accountId }, "friend")).map(x => x.friend));
-    // TOVERIFY: Should pending friendships also be kept?
-
-    // Keep friends that have been online within threshold
-    await parallelForeach([...friends], async friend => {
-        const account = (await Account.findById(friend, "LastLogin"))!;
-        const daysLoggedOut = (Date.now() - account.LastLogin.getTime()) / 86400_000;
-        if (daysLoggedOut < data.DaysLoggedOut) {
-            friends.delete(friend);
-        }
-    });
-
-    if (data.SkipClanmates) {
-        const inventory = await getInventory(accountId, "GuildId");
-        if (inventory.GuildId) {
-            await parallelForeach([...friends], async friend => {
-                const friendInventory = await getInventory(friend.toString(), "GuildId");
-                if (friendInventory.GuildId?.equals(inventory.GuildId)) {
-                    friends.delete(friend);
-                }
-            });
-        }
-    }
-
-    // Remove all remaining friends that aren't in SkipFriendIds & give response.
-    const promises = [];
-    const response: IOid[] = [];
-    for (const friend of friends) {
-        if (!data.SkipFriendIds.find(skipFriendId => checkFriendId(skipFriendId, friend))) {
-            promises.push(Friendship.deleteOne({ owner: accountId, friend: friend }));
-            promises.push(Friendship.deleteOne({ owner: friend, friend: accountId }));
-            response.push(toOid(friend));
-        }
-    }
-    await Promise.all(promises);
-    res.json({
-        Friends: response
-    } satisfies IRemoveFriendsResponse);
-};
-
-// The friend ids format is a bit weird, e.g. when 6633b81e9dba0b714f28ff02 (A) is friends with 67cdac105ef1f4b49741c267 (B), A's friend id for B is 808000105ef1f40560ca079e and B's friend id for A is 8000b81e9dba0b06408a8075.
-const checkFriendId = (friendId: string, b: Types.ObjectId): boolean => {
-    return friendId.substring(6, 6 + 8) == b.toString().substring(6, 6 + 8);
-};
-
-interface IBatchRemoveFriendsRequest {
-    DaysLoggedOut: number;
-    SkipClanmates: boolean;
-    SkipFriendIds: string[];
-}
-
-interface IRemoveFriendsResponse {
-    Friends: IOid[];
-}

src/controllers/api/renamePetController.ts

@@ -1,23 +0,0 @@
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getInventory, updateCurrency } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const renamePetController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "KubrowPets PremiumCredits PremiumCreditsFree");
-    const data = getJSONfromString<IRenamePetRequest>(String(req.body));
-    const details = inventory.KubrowPets.id(data.petId)!.Details!;
-    details.Name = data.name;
-    const currencyChanges = updateCurrency(inventory, 15, true);
-    await inventory.save();
-    res.json({
-        ...data,
-        inventoryChanges: currencyChanges
-    });
-};
-
-interface IRenamePetRequest {
-    petId: string;
-    name: string;
-}

src/controllers/api/saveDialogueController.ts

@@ -1,8 +1,10 @@
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
-import { addEmailItem, getDialogue, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addEmailItem, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { ICompletedDialogue } from "@/src/types/inventoryTypes/inventoryTypes";
+import { ICompletedDialogue, IDialogueDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 
 export const saveDialogueController: RequestHandler = async (req, res) => {
@@ -25,33 +27,33 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
         const dialogue = getDialogue(inventory, request.DialogueName);
         dialogue.Rank = request.Rank;
         dialogue.Chemistry = request.Chemistry;
-        dialogue.QueuedDialogues = request.QueuedDialogues;
-        for (const bool of request.Booleans) {
-            dialogue.Booleans.push(bool);
-            if (bool == "LizzieShawzin") {
-                await addEmailItem(
-                    inventory,
-                    "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
-                    inventoryChanges
-                );
-            }
-        }
-        for (const bool of request.ResetBooleans) {
-            const index = dialogue.Booleans.findIndex(x => x == bool);
-            if (index != -1) {
-                dialogue.Booleans.splice(index, 1);
-            }
-        }
-        for (const info of request.OtherDialogueInfos) {
-            const otherDialogue = getDialogue(inventory, info.Dialogue);
-            if (info.Tag != "") {
-                otherDialogue.QueuedDialogues.push(info.Tag);
-            }
-            otherDialogue.Chemistry += info.Value; // unsure
-        }
         if (request.Data) {
+            dialogue.QueuedDialogues = request.QueuedDialogues;
+            for (const bool of request.Booleans) {
+                dialogue.Booleans.push(bool);
+                if (bool == "LizzieShawzin") {
+                    await addEmailItem(
+                        inventory,
+                        "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
+                        inventoryChanges
+                    );
+                }
+            }
+            for (const bool of request.ResetBooleans) {
+                const index = dialogue.Booleans.findIndex(x => x == bool);
+                if (index != -1) {
+                    dialogue.Booleans.splice(index, 1);
+                }
+            }
             dialogue.Completed.push(request.Data);
             dialogue.AvailableDate = new Date(tomorrowAt0Utc);
+            for (const info of request.OtherDialogueInfos) {
+                const otherDialogue = getDialogue(inventory, info.Dialogue);
+                if (info.Tag != "") {
+                    otherDialogue.QueuedDialogues.push(info.Tag);
+                }
+                otherDialogue.Chemistry += info.Value; // unsure
+            }
             await inventory.save();
             res.json({
                 InventoryChanges: inventoryChanges,
@@ -72,7 +74,7 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
                 AvailableGiftDate: { $date: { $numberLong: tomorrowAt0Utc.toString() } }
             });
         } else {
-            res.end();
+            logger.error(`saveDialogue request not fully handled: ${String(req.body)}`);
         }
     }
 };
@@ -106,3 +108,26 @@ interface IOtherDialogueInfo {
     Tag: string;
     Value: number;
 }
+
+const getDialogue = (inventory: TInventoryDatabaseDocument, dialogueName: string): IDialogueDatabase => {
+    let dialogue = inventory.DialogueHistory!.Dialogues!.find(x => x.DialogueName == dialogueName);
+    if (!dialogue) {
+        dialogue =
+            inventory.DialogueHistory!.Dialogues![
+                inventory.DialogueHistory!.Dialogues!.push({
+                    Rank: 0,
+                    Chemistry: 0,
+                    AvailableDate: new Date(0),
+                    AvailableGiftDate: new Date(0),
+                    RankUpExpiry: new Date(0),
+                    BountyChemExpiry: new Date(0),
+                    QueuedDialogues: [],
+                    Gifts: [],
+                    Booleans: [],
+                    Completed: [],
+                    DialogueName: dialogueName
+                }) - 1
+            ];
+    }
+    return dialogue;
+};

src/controllers/api/saveLoadoutController.ts

@@ -2,12 +2,11 @@ import { RequestHandler } from "express";
 import { ISaveLoadoutRequest } from "@/src/types/saveLoadoutTypes";
 import { handleInventoryItemConfigChange } from "@/src/services/saveLoadoutService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
 
 export const saveLoadoutController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
 
-    const body: ISaveLoadoutRequest = getJSONfromString<ISaveLoadoutRequest>(String(req.body));
+    const body: ISaveLoadoutRequest = JSON.parse(req.body as string) as ISaveLoadoutRequest;
     // console.log(util.inspect(body, { showHidden: false, depth: null, colors: true }));
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/controllers/api/sellController.ts

@@ -8,8 +8,7 @@ import {
     addConsumables,
     freeUpSlot,
     combineInventoryChanges,
-    addCrewShipRawSalvage,
-    addFusionPoints
+    addCrewShipRawSalvage
 } from "@/src/services/inventoryService";
 import { InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
 import { ExportDojoRecipes } from "warframe-public-export-plus";
@@ -45,10 +44,7 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.Items.SpaceGuns || payload.Items.SpaceMelee) {
         requiredFields.add(InventorySlot.SPACEWEAPONS);
     }
-    if (payload.Items.MechSuits) {
-        requiredFields.add(InventorySlot.MECHSUITS);
-    }
-    if (payload.Items.Sentinels || payload.Items.SentinelWeapons || payload.Items.MoaPets) {
+    if (payload.Items.Sentinels || payload.Items.SentinelWeapons) {
         requiredFields.add(InventorySlot.SENTINELS);
     }
     if (payload.Items.OperatorAmps) {
@@ -73,7 +69,7 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.SellCurrency == "SC_RegularCredits") {
         inventory.RegularCredits += payload.SellPrice;
     } else if (payload.SellCurrency == "SC_FusionPoints") {
-        addFusionPoints(inventory, payload.SellPrice);
+        inventory.FusionPoints += payload.SellPrice;
     } else if (payload.SellCurrency == "SC_PrimeBucks") {
         addMiscItems(inventory, [
             {
@@ -139,12 +135,6 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SPACEWEAPONS);
         });
     }
-    if (payload.Items.MechSuits) {
-        payload.Items.MechSuits.forEach(sellItem => {
-            inventory.MechSuits.pull({ _id: sellItem.String });
-            freeUpSlot(inventory, InventorySlot.MECHSUITS);
-        });
-    }
     if (payload.Items.Sentinels) {
         payload.Items.Sentinels.forEach(sellItem => {
             inventory.Sentinels.pull({ _id: sellItem.String });
@@ -157,12 +147,6 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SENTINELS);
         });
     }
-    if (payload.Items.MoaPets) {
-        payload.Items.MoaPets.forEach(sellItem => {
-            inventory.MoaPets.pull({ _id: sellItem.String });
-            freeUpSlot(inventory, InventorySlot.SENTINELS);
-        });
-    }
     if (payload.Items.OperatorAmps) {
         payload.Items.OperatorAmps.forEach(sellItem => {
             inventory.OperatorAmps.pull({ _id: sellItem.String });
@@ -294,10 +278,8 @@ interface ISellRequest {
         SpaceSuits?: ISellItem[];
         SpaceGuns?: ISellItem[];
         SpaceMelee?: ISellItem[];
-        MechSuits?: ISellItem[];
         Sentinels?: ISellItem[];
         SentinelWeapons?: ISellItem[];
-        MoaPets?: ISellItem[];
         OperatorAmps?: ISellItem[];
         Hoverboards?: ISellItem[];
         Drones?: ISellItem[];

src/controllers/api/setDojoComponentSettingsController.ts

@@ -13,7 +13,7 @@ export const setDojoComponentSettingsController: RequestHandler = async (req, re
         res.json({ DojoRequestStatus: -1 });
         return;
     }
-    const component = guild.DojoComponents.id(req.query.componentId as string)!;
+    const component = guild.DojoComponents.id(req.query.componentId)!;
     const data = getJSONfromString<ISetDojoComponentSettingsRequest>(String(req.body));
     component.Settings = data.Settings;
     await guild.save();

src/controllers/api/setFriendNoteController.ts

@@ -1,30 +0,0 @@
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { Friendship } from "@/src/models/friendModel";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const setFriendNoteController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const payload = getJSONfromString<ISetFriendNoteRequest>(String(req.body));
-    const friendship = await Friendship.findOne({ owner: accountId, friend: payload.FriendId }, "Note Favorite");
-    if (friendship) {
-        if ("Note" in payload) {
-            friendship.Note = payload.Note;
-        } else {
-            friendship.Favorite = payload.Favorite;
-        }
-        await friendship.save();
-    }
-    res.json({
-        Id: payload.FriendId,
-        SetNote: "Note" in payload,
-        Note: friendship?.Note,
-        Favorite: friendship?.Favorite
-    });
-};
-
-interface ISetFriendNoteRequest {
-    FriendId: string;
-    Note?: string;
-    Favorite?: boolean;
-}

src/controllers/api/setGuildMotdController.ts

@@ -1,4 +1,3 @@
-import { version_compare } from "@/src/helpers/inventoryHelpers";
 import { Alliance, Guild, GuildMember } from "@/src/models/guildModel";
 import { hasGuildPermissionEx } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
@@ -56,9 +55,5 @@ export const setGuildMotdController: RequestHandler = async (req, res) => {
         await guild.save();
     }
 
-    if (!account.BuildLabel || version_compare(account.BuildLabel, "2020.03.24.20.24") > 0) {
-        res.json({ IsLongMOTD, MOTD });
-    } else {
-        res.send(MOTD).end();
-    }
+    res.json({ IsLongMOTD, MOTD });
 };

src/controllers/api/setShipFavouriteLoadoutController.ts

@@ -20,7 +20,7 @@ export const setShipFavouriteLoadoutController: RequestHandler = async (req, res
         throw new Error(`unexpected BootLocation: ${body.BootLocation}`);
     }
     await personalRooms.save();
-    res.json(body);
+    res.json({});
 };
 
 interface ISetShipFavouriteLoadoutRequest {

src/controllers/api/startDojoRecipeController.ts

@@ -11,7 +11,7 @@ import {
 import { Types } from "mongoose";
 import { ExportDojoRecipes } from "warframe-public-export-plus";
 import { config } from "@/src/services/configService";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getInventory } from "@/src/services/inventoryService";
 
 interface IStartDojoRecipeRequest {
@@ -20,10 +20,10 @@ interface IStartDojoRecipeRequest {
 }
 
 export const startDojoRecipeController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys");
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "GuildId LevelKeys");
     const guild = await getGuildForRequestEx(req, inventory);
-    if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, account._id, GuildPermission.Architect))) {
+    if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;
     }
@@ -64,5 +64,5 @@ export const startDojoRecipeController: RequestHandler = async (req, res) => {
         setDojoRoomLogFunded(guild, component);
     }
     await guild.save();
-    res.json(await getDojoClient(guild, 0, undefined, account.BuildLabel));
+    res.json(await getDojoClient(guild, 0));
 };

src/controllers/api/startRecipeController.ts

@@ -3,14 +3,12 @@ import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 import { getRecipe } from "@/src/services/itemDataService";
-import { addItem, addKubrowPet, freeUpSlot, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addItem, freeUpSlot, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { unixTimesInMs } from "@/src/constants/timeConstants";
 import { Types } from "mongoose";
 import { InventorySlot, ISpectreLoadout } from "@/src/types/inventoryTypes/inventoryTypes";
-import { fromOid, toOid } from "@/src/helpers/inventoryHelpers";
+import { toOid } from "@/src/helpers/inventoryHelpers";
 import { ExportWeapons } from "warframe-public-export-plus";
-import { getRandomElement } from "@/src/services/rngService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
 
 interface IStartRecipeRequest {
     RecipeName: string;
@@ -43,36 +41,25 @@ export const startRecipeController: RequestHandler = async (req, res) => {
         ];
 
     for (let i = 0; i != recipe.ingredients.length; ++i) {
-        if (startRecipeRequest.Ids[i] && startRecipeRequest.Ids[i][0] != "/") {
-            if (recipe.ingredients[i].ItemType == "/Lotus/Types/Game/KubrowPet/Eggs/KubrowPetEggItem") {
-                const index = inventory.KubrowPetEggs!.findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
-                if (index != -1) {
-                    inventory.KubrowPetEggs!.splice(index, 1);
-                }
-            } else {
-                const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
-                if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
-                    throw new Error(`unexpected equipment ingredient type: ${category}`);
-                }
-                const equipmentIndex = inventory[category].findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
-                if (equipmentIndex == -1) {
-                    throw new Error(`could not find equipment item to use for recipe`);
-                }
-                pr[category] ??= [];
-                pr[category].push(inventory[category][equipmentIndex]);
-                inventory[category].splice(equipmentIndex, 1);
-                freeUpSlot(inventory, InventorySlot.WEAPONS);
+        if (startRecipeRequest.Ids[i]) {
+            const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
+            if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
+                throw new Error(`unexpected equipment ingredient type: ${category}`);
             }
+            const equipmentIndex = inventory[category].findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
+            if (equipmentIndex == -1) {
+                throw new Error(`could not find equipment item to use for recipe`);
+            }
+            pr[category] ??= [];
+            pr[category].push(inventory[category][equipmentIndex]);
+            inventory[category].splice(equipmentIndex, 1);
+            freeUpSlot(inventory, InventorySlot.WEAPONS);
         } else {
             await addItem(inventory, recipe.ingredients[i].ItemType, recipe.ingredients[i].ItemCount * -1);
         }
     }
 
-    let inventoryChanges: IInventoryChanges | undefined;
-    if (recipe.secretIngredientAction == "SIA_CREATE_KUBROW") {
-        inventoryChanges = addKubrowPet(inventory, getRandomElement(recipe.secretIngredients!)!.ItemType);
-        pr.KubrowPet = new Types.ObjectId(fromOid(inventoryChanges.KubrowPets![0].ItemId));
-    } else if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
+    if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
         const spectreLoadout: ISpectreLoadout = {
             ItemType: recipe.resultType,
             Suits: "",
@@ -129,5 +116,5 @@ export const startRecipeController: RequestHandler = async (req, res) => {
 
     await inventory.save();
 
-    res.json({ RecipeId: toOid(pr._id), InventoryChanges: inventoryChanges });
+    res.json({ RecipeId: toOid(pr._id) });
 };

src/controllers/api/syndicateSacrificeController.ts

@@ -1,12 +1,11 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { ExportSyndicates, ISyndicateSacrifice } from "warframe-public-export-plus";
+import { ExportNightwave, ExportSyndicates, ISyndicateSacrifice } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { addMiscItem, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addMiscItems, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { toStoreItem } from "@/src/services/itemDataService";
-import { logger } from "@/src/utils/logger";
+import { isStoreItem, toStoreItem } from "@/src/services/itemDataService";
 
 export const syndicateSacrificeController: RequestHandler = async (request, response) => {
     const accountId = await getAccountIdForRequest(request);
@@ -18,83 +17,70 @@ export const syndicateSacrificeController: RequestHandler = async (request, resp
         syndicate = inventory.Affiliations[inventory.Affiliations.push({ Tag: data.AffiliationTag, Standing: 0 }) - 1];
     }
 
-    const oldLevel = syndicate.Title ?? 0;
-    const levelIncrease = data.SacrificeLevel - oldLevel;
-    if (levelIncrease < 0) {
-        throw new Error(`syndicate sacrifice can not decrease level`);
-    }
-    if (levelIncrease > 1 && !data.AllowMultiple) {
-        throw new Error(`desired syndicate level is an increase of ${levelIncrease}, max. allowed increase is 1`);
-    }
-
+    const level = data.SacrificeLevel - (syndicate.Title ?? 0);
     const res: ISyndicateSacrificeResponse = {
         AffiliationTag: data.AffiliationTag,
         InventoryChanges: {},
         Level: data.SacrificeLevel,
-        LevelIncrease: data.SacrificeLevel < 0 ? 1 : levelIncrease,
+        LevelIncrease: level <= 0 ? 1 : level,
         NewEpisodeReward: false
     };
 
-    // Process sacrifices and rewards for every level we're reaching
     const manifest = ExportSyndicates[data.AffiliationTag];
-    for (let level = oldLevel + Math.min(levelIncrease, 1); level <= data.SacrificeLevel; ++level) {
-        let sacrifice: ISyndicateSacrifice | undefined;
-        if (level == 0) {
-            sacrifice = manifest.initiationSacrifice;
-            if (manifest.initiationReward) {
-                combineInventoryChanges(
-                    res.InventoryChanges,
-                    (await handleStoreItemAcquisition(manifest.initiationReward, inventory)).InventoryChanges
-                );
-            }
-            syndicate.Initiated = true;
-        } else {
-            sacrifice = manifest.titles?.find(x => x.level == level)?.sacrifice;
-        }
+    let sacrifice: ISyndicateSacrifice | undefined;
+    let reward: string | undefined;
+    if (data.SacrificeLevel == 0) {
+        sacrifice = manifest.initiationSacrifice;
+        reward = manifest.initiationReward;
+        syndicate.Initiated = true;
+    } else {
+        sacrifice = manifest.titles?.find(x => x.level == data.SacrificeLevel)?.sacrifice;
+    }
 
-        if (sacrifice) {
-            updateCurrency(inventory, sacrifice.credits, false, res.InventoryChanges);
+    if (sacrifice) {
+        res.InventoryChanges = { ...updateCurrency(inventory, sacrifice.credits, false) };
 
-            for (const item of sacrifice.items) {
-                addMiscItem(inventory, item.ItemType, item.ItemCount * -1, res.InventoryChanges);
-            }
-        }
+        const miscItemChanges = sacrifice.items.map(x => ({
+            ItemType: x.ItemType,
+            ItemCount: x.ItemCount * -1
+        }));
+        addMiscItems(inventory, miscItemChanges);
+        res.InventoryChanges.MiscItems = miscItemChanges;
+    }
 
-        // Quacks like a nightwave syndicate?
-        if (manifest.dailyChallenges) {
-            const title = manifest.titles!.find(x => x.level == level);
-            if (title) {
-                res.NewEpisodeReward = true;
-                let rewardType: string;
-                let rewardCount: number;
-                if (title.storeItemReward) {
-                    rewardType = title.storeItemReward;
-                    rewardCount = 1;
-                } else {
-                    rewardType = toStoreItem(title.reward!.ItemType);
-                    rewardCount = title.reward!.ItemCount;
-                }
-                const rewardInventoryChanges = (await handleStoreItemAcquisition(rewardType, inventory, rewardCount))
-                    .InventoryChanges;
-                if (Object.keys(rewardInventoryChanges).length == 0) {
-                    logger.debug(`nightwave rank up reward did not seem to get added, giving 50 creds instead`);
-                    const nightwaveCredsItemType = manifest.titles![0].reward!.ItemType;
-                    addMiscItem(inventory, nightwaveCredsItemType, 50, rewardInventoryChanges);
-                }
-                combineInventoryChanges(res.InventoryChanges, rewardInventoryChanges);
-            }
-        } else {
-            if (level > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == level)) {
-                syndicate.FreeFavorsEarned ??= [];
-                if (!syndicate.FreeFavorsEarned.includes(level)) {
-                    syndicate.FreeFavorsEarned.push(level);
-                }
-            }
+    syndicate.Title ??= 0;
+    syndicate.Title += 1;
+
+    if (syndicate.Title > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == syndicate.Title)) {
+        syndicate.FreeFavorsEarned ??= [];
+        if (!syndicate.FreeFavorsEarned.includes(syndicate.Title)) {
+            syndicate.FreeFavorsEarned.push(syndicate.Title);
+        }
+    }
+
+    if (reward) {
+        combineInventoryChanges(
+            res.InventoryChanges,
+            (await handleStoreItemAcquisition(reward, inventory)).InventoryChanges
+        );
+    }
+
+    if (data.AffiliationTag == ExportNightwave.affiliationTag) {
+        const index = syndicate.Title - 1;
+        if (index < ExportNightwave.rewards.length) {
+            res.NewEpisodeReward = true;
+            const reward = ExportNightwave.rewards[index];
+            let rewardType = reward.uniqueName;
+            if (!isStoreItem(rewardType)) {
+                rewardType = toStoreItem(rewardType);
+            }
+            combineInventoryChanges(
+                res.InventoryChanges,
+                (await handleStoreItemAcquisition(rewardType, inventory, reward.itemCount)).InventoryChanges
+            );
         }
     }
 
-    // Commit
-    syndicate.Title = data.SacrificeLevel < 0 ? data.SacrificeLevel + 1 : data.SacrificeLevel;
     await inventory.save();
 
     response.json(res);

src/controllers/api/syndicateStandingBonusController.ts

@@ -5,7 +5,7 @@ import { IMiscItem, InventorySlot } from "@/src/types/inventoryTypes/inventoryTy
 import { IOid } from "@/src/types/commonTypes";
 import { ExportSyndicates, ExportWeapons } from "warframe-public-export-plus";
 import { logger } from "@/src/utils/logger";
-import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
 
 export const syndicateStandingBonusController: RequestHandler = async (req, res) => {
@@ -54,14 +54,13 @@ export const syndicateStandingBonusController: RequestHandler = async (req, res)
         inventoryChanges[slotBin] = { count: -1, platinum: 0, Slots: 1 };
     }
 
-    const affiliationMods: IAffiliationMods[] = [];
-    addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, affiliationMods, true);
+    const affiliationMod = addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, true);
 
     await inventory.save();
 
     res.json({
         InventoryChanges: inventoryChanges,
-        AffiliationMods: affiliationMods
+        AffiliationMods: [affiliationMod]
     });
 };
 

src/controllers/api/trainingResultController.ts

@@ -35,17 +35,6 @@ const trainingResultController: RequestHandler = async (req, res): Promise<void>
         inventory.PlayerLevel += 1;
         inventory.TradesRemaining += 1;
 
-        if (inventory.PlayerLevel == 2) {
-            await createMessage(accountId, [
-                {
-                    sndr: "/Lotus/Language/Game/Maroo",
-                    msg: "/Lotus/Language/Clan/MarooClanSearchDesc",
-                    sub: "/Lotus/Language/Clan/MarooClanSearchTitle",
-                    icon: "/Lotus/Interface/Icons/Npcs/Maroo.png"
-                }
-            ]);
-        }
-
         await createMessage(accountId, [
             {
                 sndr: "/Lotus/Language/Menu/Mailbox_WarframeSender",

src/controllers/api/updateChallengeProgressController.ts

@@ -1,26 +1,18 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { addChallenges, getInventory } from "@/src/services/inventoryService";
 import { IChallengeProgress, ISeasonChallenge } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IAffiliationMods } from "@/src/types/purchaseTypes";
 
 export const updateChallengeProgressController: RequestHandler = async (req, res) => {
     const challenges = getJSONfromString<IUpdateChallengeProgressRequest>(String(req.body));
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
 
-    const inventory = await getInventory(
-        account._id.toString(),
-        "ChallengeProgress SeasonChallengeHistory Affiliations"
-    );
+    const inventory = await getInventory(accountId, "ChallengeProgress SeasonChallengeHistory Affiliations");
     let affiliationMods: IAffiliationMods[] = [];
     if (challenges.ChallengeProgress) {
-        affiliationMods = addChallenges(
-            account,
-            inventory,
-            challenges.ChallengeProgress,
-            challenges.SeasonChallengeCompletions
-        );
+        affiliationMods = addChallenges(inventory, challenges.ChallengeProgress, challenges.SeasonChallengeCompletions);
     }
     if (challenges.SeasonChallengeHistory) {
         challenges.SeasonChallengeHistory.forEach(({ challenge, id }) => {

src/controllers/custom/addCurrencyController.ts

@@ -1,16 +1,12 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 
 export const addCurrencyController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
     const request = req.body as IAddCurrencyRequest;
-    const inventory = await getInventory(accountId, request.currency);
-    if (request.currency == "FusionPoints") {
-        addFusionPoints(inventory, request.delta);
-    } else {
-        inventory[request.currency] += request.delta;
-    }
+    inventory[request.currency] += request.delta;
     await inventory.save();
     res.end();
 };

src/controllers/custom/addItemsController.ts

@@ -7,7 +7,7 @@ export const addItemsController: RequestHandler = async (req, res) => {
     const requests = req.body as IAddItemRequest[];
     const inventory = await getInventory(accountId);
     for (const request of requests) {
-        await addItem(inventory, request.ItemType, request.ItemCount, true, undefined, undefined, true);
+        await addItem(inventory, request.ItemType, request.ItemCount, true);
     }
     await inventory.save();
     res.end();

src/controllers/custom/addMissingMaxRankModsController.ts

@@ -1,44 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-import { ExportArcanes, ExportUpgrades } from "warframe-public-export-plus";
-
-export const addMissingMaxRankModsController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "Upgrades");
-
-    const maxOwnedRanks: Record<string, number> = {};
-    for (const upgrade of inventory.Upgrades) {
-        const fingerprint = JSON.parse(upgrade.UpgradeFingerprint ?? "{}") as { lvl?: number };
-        if (fingerprint.lvl) {
-            maxOwnedRanks[upgrade.ItemType] ??= 0;
-            if (fingerprint.lvl > maxOwnedRanks[upgrade.ItemType]) {
-                maxOwnedRanks[upgrade.ItemType] = fingerprint.lvl;
-            }
-        }
-    }
-
-    for (const [uniqueName, data] of Object.entries(ExportUpgrades)) {
-        if (data.fusionLimit != 0 && data.type != "PARAZON" && maxOwnedRanks[uniqueName] != data.fusionLimit) {
-            inventory.Upgrades.push({
-                ItemType: uniqueName,
-                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
-            });
-        }
-    }
-
-    for (const [uniqueName, data] of Object.entries(ExportArcanes)) {
-        if (
-            data.name != "/Lotus/Language/Items/GenericCosmeticEnhancerName" &&
-            maxOwnedRanks[uniqueName] != data.fusionLimit
-        ) {
-            inventory.Upgrades.push({
-                ItemType: uniqueName,
-                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
-            });
-        }
-    }
-
-    await inventory.save();
-    res.end();
-};

src/controllers/custom/addXpController.ts

@@ -1,6 +1,5 @@
-import { applyClientEquipmentUpdates, getInventory } from "@/src/services/inventoryService";
+import { addGearExpByCategory, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IOid } from "@/src/types/commonTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
@@ -12,7 +11,7 @@ export const addXpController: RequestHandler = async (req, res) => {
     const request = req.body as IAddXpRequest;
     for (const [category, gear] of Object.entries(request)) {
         for (const clientItem of gear) {
-            const dbItem = inventory[category as TEquipmentKey].id((clientItem.ItemId as IOid).$oid);
+            const dbItem = inventory[category as TEquipmentKey].id(clientItem.ItemId.$oid);
             if (dbItem) {
                 if (dbItem.ItemType in ExportMisc.uniqueLevelCaps) {
                     if ((dbItem.Polarized ?? 0) < 5) {
@@ -21,7 +20,7 @@ export const addXpController: RequestHandler = async (req, res) => {
                 }
             }
         }
-        applyClientEquipmentUpdates(inventory, gear, category as TEquipmentKey);
+        addGearExpByCategory(inventory, gear, category as TEquipmentKey);
     }
     await inventory.save();
     res.end();

src/controllers/custom/deleteAccountController.ts

@@ -10,7 +10,6 @@ import { Stats } from "@/src/models/statsModel";
 import { GuildMember } from "@/src/models/guildModel";
 import { Leaderboard } from "@/src/models/leaderboardModel";
 import { deleteGuild } from "@/src/services/guildService";
-import { Friendship } from "@/src/models/friendModel";
 
 export const deleteAccountController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -23,8 +22,6 @@ export const deleteAccountController: RequestHandler = async (req, res) => {
 
     await Promise.all([
         Account.deleteOne({ _id: accountId }),
-        Friendship.deleteMany({ owner: accountId }),
-        Friendship.deleteMany({ friend: accountId }),
         GuildMember.deleteMany({ accountId: accountId }),
         Ignore.deleteMany({ ignorer: accountId }),
         Ignore.deleteMany({ ignoree: accountId }),

src/controllers/custom/getAccountInfoController.ts

@@ -1,18 +1,15 @@
 import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
-import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
 export const getAccountInfoController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
-    const inventory = await getInventory(account._id.toString(), "QuestKeys");
     const info: IAccountInfo = {
-        DisplayName: account.DisplayName,
-        IsAdministrator: isAdministrator(account),
-        CompletedVorsPrize: !!inventory.QuestKeys.find(
-            x => x.ItemType == "/Lotus/Types/Keys/VorsPrize/VorsPrizeQuestKeyChain"
-        )?.Completed
+        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.findById(guildMember.guildId, "Ranks AllianceId"))!;
@@ -34,8 +31,7 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
 
 interface IAccountInfo {
     DisplayName: string;
-    IsAdministrator: boolean;
-    CompletedVorsPrize: boolean;
+    IsAdministrator?: boolean;
     GuildId?: string;
     GuildPermissions?: number;
     GuildRank?: number;

src/controllers/custom/getItemListsController.ts

@@ -3,7 +3,6 @@ import { getDict, getItemName, getString } from "@/src/services/itemDataService"
 import {
     ExportArcanes,
     ExportAvionics,
-    ExportBoosters,
     ExportCustoms,
     ExportDrones,
     ExportGear,
@@ -20,12 +19,11 @@ import {
     ExportWeapons,
     TRelicQuality
 } from "warframe-public-export-plus";
-import allIncarnons from "@/static/fixed_responses/allIncarnonList.json";
+import archonCrystalUpgrades from "@/static/fixed_responses/webuiArchonCrystalUpgrades.json";
 
 interface ListedItem {
     uniqueName: string;
     name: string;
-    subtype?: string;
     fusionLimit?: number;
     exalted?: string[];
     badReason?: "starter" | "frivolous" | "notraw";
@@ -34,29 +32,6 @@ interface ListedItem {
     parazon?: boolean;
 }
 
-interface ItemLists {
-    uniqueLevelCaps: Record<string, number>;
-    Suits: ListedItem[];
-    LongGuns: ListedItem[];
-    Melee: ListedItem[];
-    ModularParts: ListedItem[];
-    Pistols: ListedItem[];
-    Sentinels: ListedItem[];
-    SentinelWeapons: ListedItem[];
-    SpaceGuns: ListedItem[];
-    SpaceMelee: ListedItem[];
-    SpaceSuits: ListedItem[];
-    MechSuits: ListedItem[];
-    miscitems: ListedItem[];
-    Syndicates: ListedItem[];
-    OperatorAmps: ListedItem[];
-    QuestKeys: ListedItem[];
-    KubrowPets: ListedItem[];
-    EvolutionProgress: ListedItem[];
-    mods: ListedItem[];
-    Boosters: ListedItem[];
-}
-
 const relicQualitySuffixes: Record<TRelicQuality, string> = {
     VPQ_BRONZE: "",
     VPQ_SILVER: " [Flawless]",
@@ -66,28 +41,23 @@ const relicQualitySuffixes: Record<TRelicQuality, string> = {
 
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
-    const res: ItemLists = {
-        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
-        Suits: [],
-        LongGuns: [],
-        Melee: [],
-        ModularParts: [],
-        Pistols: [],
-        Sentinels: [],
-        SentinelWeapons: [],
-        SpaceGuns: [],
-        SpaceMelee: [],
-        SpaceSuits: [],
-        MechSuits: [],
-        miscitems: [],
-        Syndicates: [],
-        OperatorAmps: [],
-        QuestKeys: [],
-        KubrowPets: [],
-        EvolutionProgress: [],
-        mods: [],
-        Boosters: []
-    };
+    const res: Record<string, ListedItem[]> = {};
+    res.Suits = [];
+    res.LongGuns = [];
+    res.Melee = [];
+    res.ModularParts = [];
+    res.Pistols = [];
+    res.Sentinels = [];
+    res.SentinelWeapons = [];
+    res.SpaceGuns = [];
+    res.SpaceMelee = [];
+    res.SpaceSuits = [];
+    res.MechSuits = [];
+    res.miscitems = [];
+    res.Syndicates = [];
+    res.OperatorAmps = [];
+    res.QuestKeys = [];
+    res.KubrowPets = [];
     for (const [uniqueName, item] of Object.entries(ExportWarframes)) {
         res[item.productCategory].push({
             uniqueName,
@@ -96,7 +66,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
     for (const [uniqueName, item] of Object.entries(ExportSentinels)) {
-        if (item.productCategory == "Sentinels" || item.productCategory == "KubrowPets") {
+        if (item.productCategory != "SpecialItems") {
             res[item.productCategory].push({
                 uniqueName,
                 name: getString(item.name, lang),
@@ -145,28 +115,12 @@ const getItemListsController: RequestHandler = (req, response) => {
         let name = getString(item.name, lang);
         if ("dissectionParts" in item) {
             name = getString("/Lotus/Language/Fish/FishDisplayName", lang).split("|FISH_NAME|").join(name);
-            if (item.syndicateTag == "CetusSyndicate") {
-                if (uniqueName.indexOf("Large") != -1) {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
-                } else if (uniqueName.indexOf("Medium") != -1) {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
-                } else {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
-                }
+            if (uniqueName.indexOf("Large") != -1) {
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
+            } else if (uniqueName.indexOf("Medium") != -1) {
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
             } else {
-                if (uniqueName.indexOf("Large") != -1) {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryElderAbbrev", lang));
-                } else if (uniqueName.indexOf("Medium") != -1) {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryMatureAbbrev", lang));
-                } else {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryYoungAbbrev", lang));
-                }
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
             }
         }
         if (
@@ -176,8 +130,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         ) {
             res.miscitems.push({
                 uniqueName: uniqueName,
-                name: name,
-                subtype: "Resource"
+                name: name
             });
         }
     }
@@ -195,8 +148,7 @@ const getItemListsController: RequestHandler = (req, response) => {
     for (const [uniqueName, item] of Object.entries(ExportGear)) {
         res.miscitems.push({
             uniqueName: uniqueName,
-            name: getString(item.name, lang),
-            subtype: "Gear"
+            name: getString(item.name, lang)
         });
     }
     const recipeNameTemplate = getString("/Lotus/Language/Items/BlueprintAndItem", lang);
@@ -232,6 +184,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
 
+    res.mods = [];
     for (const [uniqueName, upgrade] of Object.entries(ExportUpgrades)) {
         const mod: ListedItem = {
             uniqueName,
@@ -289,21 +242,12 @@ const getItemListsController: RequestHandler = (req, response) => {
             });
         }
     }
-    for (const uniqueName of allIncarnons) {
-        res.EvolutionProgress.push({
-            uniqueName,
-            name: getString(getItemName(uniqueName) || "", lang)
-        });
-    }
 
-    for (const item of Object.values(ExportBoosters)) {
-        res.Boosters.push({
-            uniqueName: item.typeName,
-            name: getString(item.name, lang)
-        });
-    }
-
-    response.json(res);
+    response.json({
+        archonCrystalUpgrades,
+        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
+        ...res
+    });
 };
 
 export { getItemListsController };

src/controllers/custom/setBoosterController.ts

@@ -1,45 +0,0 @@
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getInventory } from "@/src/services/inventoryService";
-import { RequestHandler } from "express";
-import { ExportBoosters } from "warframe-public-export-plus";
-
-const I32_MAX = 0x7fffffff;
-
-export const setBoosterController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const requests = req.body as { ItemType: string; ExpiryDate: number }[];
-    const inventory = await getInventory(accountId, "Boosters");
-    const boosters = inventory.Boosters;
-    if (
-        requests.some(request => {
-            if (typeof request.ItemType !== "string") return true;
-            if (Object.entries(ExportBoosters).find(([_, item]) => item.typeName === request.ItemType) === undefined)
-                return true;
-            if (typeof request.ExpiryDate !== "number") return true;
-            if (request.ExpiryDate < 0 || request.ExpiryDate > I32_MAX) return true;
-            return false;
-        })
-    ) {
-        res.status(400).send("Invalid ItemType provided.");
-        return;
-    }
-    const now = Math.floor(Date.now() / 1000);
-    for (const { ItemType, ExpiryDate } of requests) {
-        if (ExpiryDate < now) {
-            // remove expired boosters
-            const index = boosters.findIndex(item => item.ItemType === ItemType);
-            if (index !== -1) {
-                boosters.splice(index, 1);
-            }
-        } else {
-            const boosterItem = boosters.find(item => item.ItemType === ItemType);
-            if (boosterItem) {
-                boosterItem.ExpiryDate = ExpiryDate;
-            } else {
-                boosters.push({ ItemType, ExpiryDate });
-            }
-        }
-    }
-    await inventory.save();
-    res.end();
-};

src/controllers/custom/setEvolutionProgressController.ts

@@ -1,33 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const setEvolutionProgressController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const payload = req.body as ISetEvolutionProgressRequest;
-
-    inventory.EvolutionProgress ??= [];
-    payload.forEach(element => {
-        const entry = inventory.EvolutionProgress!.find(entry => entry.ItemType === element.ItemType);
-
-        if (entry) {
-            entry.Progress = 0;
-            entry.Rank = element.Rank;
-        } else {
-            inventory.EvolutionProgress!.push({
-                Progress: 0,
-                Rank: element.Rank,
-                ItemType: element.ItemType
-            });
-        }
-    });
-
-    await inventory.save();
-    res.end();
-};
-
-type ISetEvolutionProgressRequest = {
-    ItemType: string;
-    Rank: number;
-}[];

src/controllers/dynamic/getProfileViewingDataController.ts

@@ -18,76 +18,64 @@ import {
     ITypeXPItem
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
-import { catBreadHash, getJSONfromString } from "@/src/helpers/stringHelpers";
+import { catBreadHash } from "@/src/helpers/stringHelpers";
 import { ExportCustoms, ExportDojoRecipes } from "warframe-public-export-plus";
 import { IStatsClient } from "@/src/types/statTypes";
 import { toStoreItem } from "@/src/services/itemDataService";
-import { FlattenMaps } from "mongoose";
 
-const getProfileViewingDataByPlayerIdImpl = async (playerId: string): Promise<IProfileViewingData | undefined> => {
-    const account = await Account.findById(playerId, "DisplayName");
-    if (!account) {
-        return;
-    }
-    const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
-
-    const result: IPlayerProfileViewingDataResult = {
-        AccountId: toOid(account._id),
-        DisplayName: account.DisplayName,
-        PlayerLevel: inventory.PlayerLevel,
-        LoadOutInventory: {
-            WeaponSkins: [],
-            XPInfo: inventory.XPInfo
-        },
-        PlayerSkills: inventory.PlayerSkills,
-        ChallengeProgress: inventory.ChallengeProgress,
-        DeathMarks: inventory.DeathMarks,
-        Harvestable: inventory.Harvestable,
-        DeathSquadable: inventory.DeathSquadable,
-        Created: toMongoDate(inventory.Created),
-        MigratedToConsole: false,
-        Missions: inventory.Missions,
-        Affiliations: inventory.Affiliations,
-        DailyFocus: inventory.DailyFocus,
-        Wishlist: inventory.Wishlist,
-        Alignment: inventory.Alignment
-    };
-    await populateLoadout(inventory, result);
-    if (inventory.GuildId) {
-        const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
-        populateGuild(guild, result);
-    }
-    for (const key of allDailyAffiliationKeys) {
-        result[key] = inventory[key];
-    }
-
-    const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
-    delete stats._id;
-    delete stats.__v;
-    delete stats.accountOwnerId;
-
-    return {
-        Results: [result],
-        TechProjects: [],
-        XpComponents: [],
-        //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
-        Stats: stats
-    };
-};
-
-export const getProfileViewingDataGetController: RequestHandler = async (req, res) => {
+export const getProfileViewingDataController: RequestHandler = async (req, res) => {
     if (req.query.playerId) {
-        const data = await getProfileViewingDataByPlayerIdImpl(req.query.playerId as string);
-        if (data) {
-            res.json(data);
-        } else {
+        const account = await Account.findById(req.query.playerId as string, "DisplayName");
+        if (!account) {
             res.status(409).send("Could not find requested account");
+            return;
         }
+        const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
+
+        const result: IPlayerProfileViewingDataResult = {
+            AccountId: toOid(account._id),
+            DisplayName: account.DisplayName,
+            PlayerLevel: inventory.PlayerLevel,
+            LoadOutInventory: {
+                WeaponSkins: [],
+                XPInfo: inventory.XPInfo
+            },
+            PlayerSkills: inventory.PlayerSkills,
+            ChallengeProgress: inventory.ChallengeProgress,
+            DeathMarks: inventory.DeathMarks,
+            Harvestable: inventory.Harvestable,
+            DeathSquadable: inventory.DeathSquadable,
+            Created: toMongoDate(inventory.Created),
+            MigratedToConsole: false,
+            Missions: inventory.Missions,
+            Affiliations: inventory.Affiliations,
+            DailyFocus: inventory.DailyFocus,
+            Wishlist: inventory.Wishlist,
+            Alignment: inventory.Alignment
+        };
+        await populateLoadout(inventory, result);
+        if (inventory.GuildId) {
+            const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
+            populateGuild(guild, result);
+        }
+        for (const key of allDailyAffiliationKeys) {
+            result[key] = inventory[key];
+        }
+
+        const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
+        delete stats._id;
+        delete stats.__v;
+        delete stats.accountOwnerId;
+
+        res.json({
+            Results: [result],
+            TechProjects: [],
+            XpComponents: [],
+            //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
+            Stats: stats
+        });
     } else if (req.query.guildId) {
-        const guild = await Guild.findById(
-            req.query.guildId as string,
-            "Name Tier XP Class Emblem TechProjects ClaimedXP"
-        );
+        const guild = await Guild.findById(req.query.guildId, "Name Tier XP Class Emblem TechProjects ClaimedXP");
         if (!guild) {
             res.status(409).send("Could not find guild");
             return;
@@ -182,28 +170,6 @@ export const getProfileViewingDataGetController: RequestHandler = async (req, re
     }
 };
 
-// For old versions, this was an authenticated POST request.
-interface IGetProfileViewingDataRequest {
-    AccountId: string;
-}
-export const getProfileViewingDataPostController: RequestHandler = async (req, res) => {
-    const payload = getJSONfromString<IGetProfileViewingDataRequest>(String(req.body));
-    const data = await getProfileViewingDataByPlayerIdImpl(payload.AccountId);
-    if (data) {
-        res.json(data);
-    } else {
-        res.status(409).send("Could not find requested account");
-    }
-};
-
-interface IProfileViewingData {
-    Results: IPlayerProfileViewingDataResult[];
-    TechProjects: [];
-    XpComponents: [];
-    //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
-    Stats: FlattenMaps<Partial<TStatsDatabaseDocument>>;
-}
-
 interface IPlayerProfileViewingDataResult extends Partial<IDailyAffiliations> {
     AccountId: IOid;
     DisplayName: string;

src/controllers/stats/viewController.ts

@@ -27,15 +27,7 @@ const viewController: RequestHandler = async (req, res) => {
         for (const type of Object.keys(ExportEnemies.avatars)) {
             if (!scans.has(type)) scans.add(type);
         }
-
-        // Take any existing scans and also set them to 9999
-        if (responseJson.Scans) {
-            for (const scan of responseJson.Scans) {
-                scans.add(scan.type);
-            }
-        }
-        responseJson.Scans = [];
-
+        responseJson.Scans ??= [];
         for (const type of scans) {
             responseJson.Scans.push({ type: type, scans: 9999 });
         }

src/helpers/customHelpers/customHelpers.ts

@@ -48,8 +48,7 @@ const toDatabaseAccount = (createAccount: IAccountCreation): IDatabaseAccountReq
         CrossPlatformAllowed: true,
         ForceLogoutVersion: 0,
         TrackedSettings: [],
-        Nonce: 0,
-        LastLogin: new Date()
+        Nonce: 0
     } satisfies IDatabaseAccountRequiredFields;
 };
 

src/helpers/inventoryHelpers.ts

@@ -1,56 +1,15 @@
-import { IMongoDate, IOid, IOidWithLegacySupport } from "@/src/types/commonTypes";
+import { IMongoDate, IOid } from "@/src/types/commonTypes";
 import { Types } from "mongoose";
 import { TRarity } from "warframe-public-export-plus";
 
-export const version_compare = (a: string, b: string): number => {
-    const a_digits = a
-        .split("/")[0]
-        .split(".")
-        .map(x => parseInt(x));
-    const b_digits = b
-        .split("/")[0]
-        .split(".")
-        .map(x => parseInt(x));
-    for (let i = 0; i != a_digits.length; ++i) {
-        if (a_digits[i] != b_digits[i]) {
-            return a_digits[i] > b_digits[i] ? 1 : -1;
-        }
-    }
-    return 0;
-};
-
 export const toOid = (objectId: Types.ObjectId): IOid => {
-    return { $oid: objectId.toString() };
-};
-
-export function toOid2(objectId: Types.ObjectId, buildLabel: undefined): IOid;
-export function toOid2(objectId: Types.ObjectId, buildLabel: string | undefined): IOidWithLegacySupport;
-export function toOid2(objectId: Types.ObjectId, buildLabel: string | undefined): IOidWithLegacySupport {
-    if (buildLabel && version_compare(buildLabel, "2016.12.21.19.13") <= 0) {
-        return { $id: objectId.toString() };
-    }
-    return { $oid: objectId.toString() };
-}
-
-export const toLegacyOid = (oid: IOidWithLegacySupport): void => {
-    if (!("$id" in oid)) {
-        oid.$id = oid.$oid;
-        delete oid.$oid;
-    }
-};
-
-export const fromOid = (oid: IOidWithLegacySupport): string => {
-    return (oid.$oid ?? oid.$id)!;
+    return { $oid: objectId.toString() } satisfies IOid;
 };
 
 export const toMongoDate = (date: Date): IMongoDate => {
     return { $date: { $numberLong: date.getTime().toString() } };
 };
 
-export const fromMongoDate = (date: IMongoDate): Date => {
-    return new Date(parseInt(date.$date.$numberLong));
-};
-
 export const kubrowWeights: Record<TRarity, number> = {
     COMMON: 6,
     UNCOMMON: 4,

src/helpers/nemesisHelpers.ts

@@ -1,203 +1,15 @@
-import { ExportRegions, ExportWarframes } from "warframe-public-export-plus";
-import { IInfNode, TNemesisFaction } from "@/src/types/inventoryTypes/inventoryTypes";
-import { getRewardAtPercentage, SRng } from "@/src/services/rngService";
+import { ExportRegions } from "warframe-public-export-plus";
+import { IInfNode } from "@/src/types/inventoryTypes/inventoryTypes";
+import { SRng } from "@/src/services/rngService";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
 import { logger } from "../utils/logger";
 import { IOid } from "../types/commonTypes";
 import { Types } from "mongoose";
-import { addMods, generateRewardSeed } from "../services/inventoryService";
-import { isArchwingMission } from "../services/worldStateService";
+import { addMods } from "../services/inventoryService";
 
-type TInnateDamageTag =
-    | "InnateElectricityDamage"
-    | "InnateHeatDamage"
-    | "InnateFreezeDamage"
-    | "InnateToxinDamage"
-    | "InnateMagDamage"
-    | "InnateRadDamage"
-    | "InnateImpactDamage";
-
-export interface INemesisManifest {
-    weapons: readonly string[];
-    systemIndexes: readonly number[];
-    showdownNode: string;
-    ephemeraChance: number;
-    ephemeraTypes?: Record<TInnateDamageTag, string>;
-    firstKillReward: string;
-    firstConvertReward: string;
-    messageTitle: string;
-    messageBody: string;
-    minBuild: string;
-}
-
-class KuvaLichManifest implements INemesisManifest {
-    weapons = [
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
-        "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
-        "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
-        "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
-        "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
-        "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
-        "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
-        "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
-        "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon"
-    ];
-    systemIndexes = [2, 3, 9, 11, 18];
-    showdownNode = "CrewBattleNode557";
-    ephemeraChance = 0.05;
-    ephemeraTypes = {
-        InnateElectricityDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaLightningEphemera",
-        InnateHeatDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaFireEphemera",
-        InnateFreezeDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaIceEphemera",
-        InnateToxinDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaToxinEphemera",
-        InnateMagDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaMagneticEphemera",
-        InnateRadDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaTricksterEphemera",
-        InnateImpactDamage: "/Lotus/Upgrades/Skins/Effects/Kuva/KuvaImpactEphemera"
-    };
-    firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Clan/LichKillerBadgeItem";
-    firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/KuvaLichSigil";
-    messageTitle = "/Lotus/Language/Inbox/VanquishKuvaMsgTitle";
-    messageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody";
-    minBuild = "2019.10.31.22.42"; // 26.0.0
-}
-
-class KuvaLichManifestVersionTwo extends KuvaLichManifest {
-    constructor() {
-        super();
-        this.ephemeraChance = 0.1;
-        this.minBuild = "2020.03.05.16.06"; // Unsure about this one, so using the same value as in version three.
-    }
-}
-
-class KuvaLichManifestVersionThree extends KuvaLichManifestVersionTwo {
-    constructor() {
-        super();
-        this.weapons.push("/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon");
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind");
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor");
-        this.ephemeraChance = 0.2;
-        this.minBuild = "2020.03.05.16.06"; // This is 27.2.0, tho 27.1.0 should also recognise this.
-    }
-}
-
-class KuvaLichManifestVersionFour extends KuvaLichManifestVersionThree {
-    constructor() {
-        super();
-        this.minBuild = "2021.07.05.17.03"; // Unsure about this one, so using the same value as in version five.
-    }
-}
-
-class KuvaLichManifestVersionFive extends KuvaLichManifestVersionFour {
-    constructor() {
-        super();
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon");
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr");
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler");
-        this.minBuild = "2021.07.05.17.03"; // 30.5.0
-    }
-}
-
-class KuvaLichManifestVersionSix extends KuvaLichManifestVersionFive {
-    constructor() {
-        super();
-        this.weapons.push("/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek");
-        this.minBuild = "2024.05.15.11.07"; // 35.6.0
-    }
-}
-
-class LawyerManifest implements INemesisManifest {
-    weapons = [
-        "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
-        "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
-        "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
-        "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
-        "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
-        "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
-        "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
-        "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol"
-    ];
-    systemIndexes = [1, 15, 4, 7, 8];
-    showdownNode = "CrewBattleNode558";
-    ephemeraChance = 0.2;
-    ephemeraTypes = {
-        InnateElectricityDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraA",
-        InnateHeatDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraB",
-        InnateFreezeDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraC",
-        InnateToxinDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraD",
-        InnateMagDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraE",
-        InnateRadDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraF",
-        InnateImpactDamage: "/Lotus/Upgrades/Skins/Effects/CorpusLichEphemeraG"
-    };
-    firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Clan/CorpusLichBadgeItem";
-    firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/CorpusLichSigil";
-    messageTitle = "/Lotus/Language/Inbox/VanquishLawyerMsgTitle";
-    messageBody = "/Lotus/Language/Inbox/VanquishLichMsgBody";
-    minBuild = "2021.07.05.17.03"; // 30.5.0
-}
-
-class LawyerManifestVersionTwo extends LawyerManifest {
-    constructor() {
-        super();
-        this.weapons.push("/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon");
-        this.minBuild = "2022.11.30.08.13"; // 32.2.0
-    }
-}
-
-class LawyerManifestVersionThree extends LawyerManifestVersionTwo {
-    constructor() {
-        super();
-        this.weapons.push("/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion");
-        this.minBuild = "2024.05.15.11.07"; // 35.6.0
-    }
-}
-
-class LawyerManifestVersionFour extends LawyerManifestVersionThree {
-    constructor() {
-        super();
-        this.minBuild = "2024.10.01.11.03"; // 37.0.0
-    }
-}
-
-class InfestedLichManfest implements INemesisManifest {
-    weapons = [];
-    systemIndexes = [23];
-    showdownNode = "CrewBattleNode559";
-    ephemeraChance = 0;
-    firstKillReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/InfLichVanquishedSigil";
-    firstConvertReward = "/Lotus/StoreItems/Upgrades/Skins/Sigils/InfLichConvertedSigil";
-    messageTitle = "/Lotus/Language/Inbox/VanquishBandMsgTitle";
-    messageBody = "/Lotus/Language/Inbox/VanquishBandMsgBody";
-    minBuild = "2025.03.18.09.51"; // 38.5.0
-}
-
-const nemesisManifests: Record<string, INemesisManifest> = {
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifest": new KuvaLichManifest(),
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionTwo": new KuvaLichManifestVersionTwo(),
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionThree": new KuvaLichManifestVersionThree(),
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionFour": new KuvaLichManifestVersionFour(),
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionFive": new KuvaLichManifestVersionFive(),
-    "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix": new KuvaLichManifestVersionSix(),
-    "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifest": new LawyerManifest(),
-    "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionTwo": new LawyerManifestVersionTwo(),
-    "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree": new LawyerManifestVersionThree(),
-    "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour": new LawyerManifestVersionFour(),
-    "/Lotus/Types/Enemies/InfestedLich/InfestedLichManifest": new InfestedLichManfest()
-};
-
-export const getNemesisManifest = (manifest: string): INemesisManifest => {
-    if (manifest in nemesisManifests) {
-        return nemesisManifests[manifest];
-    }
-    throw new Error(`unknown nemesis manifest: ${manifest}`);
-};
-
-export const getInfNodes = (manifest: INemesisManifest, rank: number): IInfNode[] => {
+export const getInfNodes = (faction: string, rank: number): IInfNode[] => {
     const infNodes = [];
-    const systemIndex = manifest.systemIndexes[rank];
+    const systemIndex = systemIndexes[faction][rank];
     for (const [key, value] of Object.entries(ExportRegions)) {
         if (
             value.systemIndex === systemIndex &&
@@ -210,7 +22,7 @@ export const getInfNodes = (manifest: INemesisManifest, rank: number): IInfNode[
             value.missionIndex != 42 && // not face off
             value.name.indexOf("1999NodeI") == -1 && // not stage defence
             value.name.indexOf("1999NodeJ") == -1 && // not lich bounty
-            !isArchwingMission(value)
+            value.name.indexOf("Archwing") == -1
         ) {
             //console.log(dict_en[value.name]);
             infNodes.push({ Node: key, Influence: 1 });
@@ -219,95 +31,43 @@ export const getInfNodes = (manifest: INemesisManifest, rank: number): IInfNode[
     return infNodes;
 };
 
-// Get a parazon 'passcode' based on the nemesis fingerprint so it's always the same for the same nemesis.
-export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: TNemesisFaction }): number[] => {
-    const rng = new SRng(nemesis.fp);
-    const choices = [0, 1, 2, 3, 5, 6, 7];
-    let choiceIndex = rng.randomInt(0, choices.length - 1);
-    const passcode = [choices[choiceIndex]];
-    if (nemesis.Faction != "FC_INFESTATION") {
-        choices.splice(choiceIndex, 1);
-        choiceIndex = rng.randomInt(0, choices.length - 1);
-        passcode.push(choices[choiceIndex]);
+const systemIndexes: Record<string, number[]> = {
+    FC_GRINEER: [2, 3, 9, 11, 18],
+    FC_CORPUS: [1, 15, 4, 7, 8],
+    FC_INFESTATION: [23]
+};
 
-        choices.splice(choiceIndex, 1);
-        choiceIndex = rng.randomInt(0, choices.length - 1);
-        passcode.push(choices[choiceIndex]);
+// Get a parazon 'passcode' based on the nemesis fingerprint so it's always the same for the same nemesis.
+export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: string }): number[] => {
+    const rng = new SRng(nemesis.fp);
+    const passcode = [rng.randomInt(0, 7)];
+    if (nemesis.Faction != "FC_INFESTATION") {
+        passcode.push(rng.randomInt(0, 7));
+        passcode.push(rng.randomInt(0, 7));
     }
     return passcode;
 };
 
-const requiemMods: readonly string[] = [
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalOneMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalTwoMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalThreeMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalFourMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalFiveMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalSixMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalSevenMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalEightMod"
-];
-
-const antivirusMods: readonly string[] = [
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusOneMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusTwoMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusThreeMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusFourMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusFiveMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusSixMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusSevenMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusEightMod"
-];
-
-export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: TNemesisFaction }): string[] => {
-    const passcode = getNemesisPasscode(nemesis);
-    return nemesis.Faction == "FC_INFESTATION"
-        ? passcode.map(i => antivirusMods[i])
-        : passcode.map(i => requiemMods[i]);
-};
-
-// Symbols; 0-7 are the normal requiem mods.
-export const GUESS_NONE = 8;
-export const GUESS_WILDCARD = 9;
-
-// Results; there are 3, 4, 5 as well which are more muted versions but unused afaik.
-export const GUESS_NEUTRAL = 0;
-export const GUESS_INCORRECT = 1;
-export const GUESS_CORRECT = 2;
-
-interface NemesisPositionGuess {
-    symbol: number;
-    result: number;
-}
-
-export type NemesisGuess = [NemesisPositionGuess, NemesisPositionGuess, NemesisPositionGuess];
-
-export const encodeNemesisGuess = (guess: NemesisGuess): number => {
+export const encodeNemesisGuess = (
+    symbol1: number,
+    result1: number,
+    symbol2: number,
+    result2: number,
+    symbol3: number,
+    result3: number
+): number => {
     return (
-        (guess[0].symbol & 0xf) |
-        ((guess[0].result & 3) << 12) |
-        ((guess[1].symbol << 4) & 0xff) |
-        ((guess[1].result << 14) & 0xffff) |
-        ((guess[2].symbol & 0xf) << 8) |
-        ((guess[2].result & 3) << 16)
+        (symbol1 & 0xf) |
+        ((result1 & 3) << 12) |
+        ((symbol2 << 4) & 0xff) |
+        ((result2 << 14) & 0xffff) |
+        ((symbol3 & 0xf) << 8) |
+        ((result3 & 3) << 16)
     );
 };
 
-export const decodeNemesisGuess = (val: number): NemesisGuess => {
-    return [
-        {
-            symbol: val & 0xf,
-            result: (val >> 12) & 3
-        },
-        {
-            symbol: (val & 0xff) >> 4,
-            result: (val & 0xffff) >> 14
-        },
-        {
-            symbol: (val >> 8) & 0xf,
-            result: (val >> 16) & 3
-        }
-    ];
+export const decodeNemesisGuess = (val: number): number[] => {
+    return [val & 0xf, (val >> 12) & 3, (val & 0xff) >> 4, (val & 0xffff) >> 14, (val >> 8) & 0xf, (val >> 16) & 3];
 };
 
 export interface IKnifeResponse {
@@ -318,31 +78,6 @@ export interface IKnifeResponse {
     HasKnife?: boolean;
 }
 
-export const getKnifeUpgrade = (
-    inventory: TInventoryDatabaseDocument,
-    dataknifeUpgrades: string[],
-    type: string
-): { ItemId: IOid; ItemType: string } => {
-    if (dataknifeUpgrades.indexOf(type) != -1) {
-        return {
-            ItemId: { $oid: "000000000000000000000000" },
-            ItemType: type
-        };
-    }
-    for (const upgradeId of dataknifeUpgrades) {
-        if (upgradeId.length == 24) {
-            const upgrade = inventory.Upgrades.id(upgradeId);
-            if (upgrade && upgrade.ItemType == type) {
-                return {
-                    ItemId: { $oid: upgradeId },
-                    ItemType: type
-                };
-            }
-        }
-    }
-    throw new Error(`${type} does not seem to be installed on parazon?!`);
-};
-
 export const consumeModCharge = (
     response: IKnifeResponse,
     inventory: TInventoryDatabaseDocument,
@@ -393,121 +128,3 @@ export const consumeModCharge = (
         response.UpgradeNew.push(true);
     }
 };
-
-export const getInnateDamageTag = (KillingSuit: string): TInnateDamageTag => {
-    return ExportWarframes[KillingSuit].nemesisUpgradeTag!;
-};
-
-const petHeads = [
-    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadA",
-    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadB",
-    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC"
-] as const;
-
-export interface INemesisProfile {
-    innateDamageTag: TInnateDamageTag;
-    innateDamageValue: number;
-    ephemera?: string;
-    petHead?: (typeof petHeads)[number];
-    petBody?: string;
-    petLegs?: string;
-    petTail?: string;
-}
-
-export const generateNemesisProfile = (
-    fp: bigint = generateRewardSeed(),
-    manifest: INemesisManifest = new LawyerManifest(),
-    killingSuit: string = "/Lotus/Powersuits/Ember/Ember"
-): INemesisProfile => {
-    const rng = new SRng(fp);
-    rng.randomFloat(); // used for the weapon index
-    const WeaponUpgradeValueAttenuationExponent = 2.25;
-    let value = Math.pow(rng.randomFloat(), WeaponUpgradeValueAttenuationExponent);
-    if (value >= 0.941428) {
-        value = 1;
-    }
-    const profile: INemesisProfile = {
-        innateDamageTag: getInnateDamageTag(killingSuit),
-        innateDamageValue: Math.trunc(value * 0x40000000) // TODO: For -1399275245665749231n, the value should be 75306944, but we're off by 59 with 75307003.
-    };
-    if (rng.randomFloat() <= manifest.ephemeraChance && manifest.ephemeraTypes) {
-        profile.ephemera = manifest.ephemeraTypes[profile.innateDamageTag];
-    }
-    rng.randomFloat(); // something related to sentinel agent maybe
-    if (manifest instanceof LawyerManifest) {
-        profile.petHead = rng.randomElement(petHeads)!;
-        profile.petBody = rng.randomElement([
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyA",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyB",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyC"
-        ])!;
-        profile.petLegs = rng.randomElement([
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsA",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsB",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsC"
-        ])!;
-        profile.petTail = rng.randomElement([
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailA",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailB",
-            "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailC"
-        ])!;
-    }
-    return profile;
-};
-
-export const getKillTokenRewardCount = (fp: bigint): number => {
-    const rng = new SRng(fp);
-    return rng.randomInt(10, 15);
-};
-
-// /Lotus/Types/Enemies/InfestedLich/InfestedLichRewardManifest
-const infestedLichRotA = [
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDJRomHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDJRomInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDrillbitHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDrillbitInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyHarddriveHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyHarddriveInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyPacketHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyPacketInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyZekeHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyZekeInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandBillboardPosterA", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandBillboardPosterB", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandDespairPoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandGridPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandHuddlePoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandJumpPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLimoPoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLookingDownPosterDay", probability: 0.046 },
-    {
-        type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLookingDownPosterNight",
-        probability: 0.045
-    },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandSillyPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandWhiteBluePoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandWhitePinkPoster", probability: 0.045 }
-];
-const infestedLichRotB = [
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraA", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraB", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraC", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraD", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraE", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraF", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraG", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraH", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceDJRomHype", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DancePacketWindmillShuffle", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceHarddrivePony", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceDrillbitCrisscross", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceZekeCanthavethis", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/PhotoBooth/PhotoboothTileRJLasXStadiumBossArena", probability: 0.071 }
-];
-export const getInfestedLichItemRewards = (fp: bigint): string[] => {
-    const rng = new SRng(fp);
-    const rotAReward = getRewardAtPercentage(infestedLichRotA, rng.randomFloat())!.type;
-    rng.randomFloat(); // unused afaict
-    const rotBReward = getRewardAtPercentage(infestedLichRotB, rng.randomFloat())!.type;
-    return [rotAReward, rotBReward];
-};

src/helpers/pathHelper.ts

@@ -1,5 +1,4 @@
 import path from "path";
 
 export const rootDir = path.join(__dirname, "../..");
-export const isDev = path.basename(rootDir) != "build";
-export const repoDir = isDev ? rootDir : path.join(rootDir, "..");
+export const repoDir = path.basename(rootDir) == "build" ? path.join(rootDir, "..") : rootDir;

src/helpers/rivenHelper.ts

@@ -31,7 +31,7 @@ export interface IFingerprintStat {
 }
 
 export const createVeiledRivenFingerprint = (meta: IUpgrade): IVeiledRivenFingerprint => {
-    const challenge = getRandomElement(meta.availableChallenges!)!;
+    const challenge = getRandomElement(meta.availableChallenges!);
     const fingerprintChallenge: IRivenChallenge = {
         Type: challenge.fullName,
         Progress: 0,
@@ -54,11 +54,11 @@ export const createVeiledRivenFingerprint = (meta: IUpgrade): IVeiledRivenFinger
 
 export const createUnveiledRivenFingerprint = (meta: IUpgrade): IUnveiledRivenFingerprint => {
     const fingerprint: IUnveiledRivenFingerprint = {
-        compat: getRandomElement(meta.compatibleItems!)!,
+        compat: getRandomElement(meta.compatibleItems!),
         lim: 0,
         lvl: 0,
         lvlReq: getRandomInt(8, 16),
-        pol: getRandomElement(["AP_ATTACK", "AP_DEFENSE", "AP_TACTIC"])!,
+        pol: getRandomElement(["AP_ATTACK", "AP_DEFENSE", "AP_TACTIC"]),
         buffs: [],
         curses: []
     };
@@ -81,7 +81,7 @@ export const randomiseRivenStats = (meta: IUpgrade, fingerprint: IUnveiledRivenF
     if (Math.random() < 0.5) {
         const entry = getRandomElement(
             meta.upgradeEntries!.filter(x => x.canBeCurse && !fingerprint.buffs.find(y => y.Tag == x.tag))
-        )!;
+        );
         fingerprint.curses.push({ Tag: entry.tag, Value: Math.trunc(Math.random() * 0x40000000) });
     }
 };

src/helpers/stringHelpers.ts

@@ -2,7 +2,7 @@ import { JSONParse } from "json-with-bigint";
 
 export const getJSONfromString = <T>(str: string): T => {
     const jsonSubstring = str.substring(0, str.lastIndexOf("}") + 1);
-    return JSONParse(jsonSubstring) as T;
+    return JSONParse<T>(jsonSubstring);
 };
 
 export const getSubstringFromKeyword = (str: string, keyword: string): string => {

src/helpers/syndicateStandingHelper.ts

@@ -10,14 +10,3 @@ export const getMaxStanding = (syndicate: ISyndicate, title: number): number =>
     }
     return syndicate.titles.find(x => x.level == title)!.maxStanding;
 };
-
-export const getMinStanding = (syndicate: ISyndicate, title: number): number => {
-    if (!syndicate.titles) {
-        // LibrarySyndicate
-        return 0;
-    }
-    if (title == 0) {
-        return syndicate.titles.find(x => x.level == -1)!.maxStanding;
-    }
-    return syndicate.titles.find(x => x.level == title)!.minStanding;
-};

src/index.ts

@@ -12,14 +12,18 @@ import { logger } from "@/src/utils/logger";
 logger.info("Starting up...");
 
 // Proceed with normal startup: bring up config watcher service, validate config, connect to MongoDB, and finally start listening for HTTP.
+import http from "http";
+import https from "https";
+import fs from "node:fs";
+import { app } from "./app";
 import mongoose from "mongoose";
-import { JSONStringify } from "json-with-bigint";
-import { startWebServer } from "./services/webService";
-
+import { Json, JSONStringify } from "json-with-bigint";
 import { validateConfig } from "@/src/services/configWatcherService";
 
 // Patch JSON.stringify to work flawlessly with Bigints.
-JSON.stringify = JSONStringify;
+JSON.stringify = (obj: Exclude<Json, undefined>, _replacer?: unknown, space?: string | number): string => {
+    return JSONStringify(obj, space);
+};
 
 validateConfig();
 
@@ -27,7 +31,26 @@ mongoose
     .connect(config.mongodbUrl)
     .then(() => {
         logger.info("Connected to MongoDB");
-        startWebServer();
+
+        const httpPort = config.httpPort || 80;
+        const httpsPort = config.httpsPort || 443;
+        const options = {
+            key: fs.readFileSync("static/certs/key.pem"),
+            cert: fs.readFileSync("static/certs/cert.pem")
+        };
+
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        http.createServer(app).listen(httpPort, () => {
+            logger.info("HTTP server started on port " + httpPort);
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            https.createServer(options, app).listen(httpsPort, () => {
+                logger.info("HTTPS server started on port " + httpsPort);
+
+                logger.info(
+                    "Access the WebUI in your browser at http://localhost" + (httpPort == 80 ? "" : ":" + httpPort)
+                );
+            });
+        });
     })
     .catch(error => {
         if (error instanceof Error) {

src/managers/sessionManager.ts

@@ -1,12 +1,10 @@
 import { ISession, IFindSessionRequest } from "@/src/types/session";
 import { logger } from "@/src/utils/logger";
-import { JSONParse } from "json-with-bigint";
-import { Types } from "mongoose";
 
 const sessions: ISession[] = [];
 
-function createNewSession(sessionData: ISession, Creator: Types.ObjectId): ISession {
-    const sessionId = new Types.ObjectId();
+function createNewSession(sessionData: ISession, Creator: string): ISession {
+    const sessionId = getNewSessionID();
     const newSession: ISession = {
         sessionId,
         creatorId: Creator,
@@ -27,7 +25,7 @@ function createNewSession(sessionData: ISession, Creator: Types.ObjectId): ISess
         customSettings: sessionData.customSettings || "",
         rewardSeed: sessionData.rewardSeed || -1,
         guildId: sessionData.guildId || "",
-        buildId: sessionData.buildId || 4920386201513015989n,
+        buildId: sessionData.buildId || 4920386201513015989,
         platform: sessionData.platform || 0,
         xplatform: sessionData.xplatform || true,
         freePublic: sessionData.freePublic || 3,
@@ -42,15 +40,13 @@ function getAllSessions(): ISession[] {
     return sessions;
 }
 
-function getSessionByID(sessionId: string | Types.ObjectId): ISession | undefined {
-    return sessions.find(session => session.sessionId.equals(sessionId));
+function getSessionByID(sessionId: string): ISession | undefined {
+    return sessions.find(session => session.sessionId === sessionId);
 }
 
-function getSession(
-    sessionIdOrRequest: string | Types.ObjectId | IFindSessionRequest
-): { createdBy: Types.ObjectId; id: Types.ObjectId }[] {
-    if (typeof sessionIdOrRequest === "string" || sessionIdOrRequest instanceof Types.ObjectId) {
-        const session = sessions.find(session => session.sessionId.equals(sessionIdOrRequest));
+function getSession(sessionIdOrRequest: string | IFindSessionRequest): { createdBy: string; id: string }[] {
+    if (typeof sessionIdOrRequest === "string") {
+        const session = sessions.find(session => session.sessionId === sessionIdOrRequest);
         if (session) {
             logger.debug("Found Sessions:", { session });
             return [
@@ -83,15 +79,35 @@ function getSession(
     }));
 }
 
-function getSessionByCreatorID(creatorId: string | Types.ObjectId): ISession | undefined {
-    return sessions.find(session => session.creatorId.equals(creatorId));
+function getSessionByCreatorID(creatorId: string): ISession | undefined {
+    return sessions.find(session => session.creatorId === creatorId);
 }
 
-function updateSession(sessionId: string | Types.ObjectId, sessionData: string): boolean {
-    const session = sessions.find(session => session.sessionId.equals(sessionId));
+function getNewSessionID(): string {
+    const characters = "0123456789abcdef";
+    const maxAttempts = 100;
+    let sessionId = "";
+
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        sessionId = "64";
+        for (let i = 0; i < 22; i++) {
+            const randomIndex = Math.floor(Math.random() * characters.length);
+            sessionId += characters[randomIndex];
+        }
+
+        if (!sessions.some(session => session.sessionId === sessionId)) {
+            return sessionId;
+        }
+    }
+
+    throw new Error("Failed to generate a unique session ID");
+}
+
+function updateSession(sessionId: string, sessionData: string): boolean {
+    const session = sessions.find(session => session.sessionId === sessionId);
     if (!session) return false;
     try {
-        Object.assign(session, JSONParse(sessionData));
+        Object.assign(session, JSON.parse(sessionData));
         return true;
     } catch (error) {
         console.error("Invalid JSON string for session update.");
@@ -99,8 +115,8 @@ function updateSession(sessionId: string | Types.ObjectId, sessionData: string):
     }
 }
 
-function deleteSession(sessionId: string | Types.ObjectId): boolean {
-    const index = sessions.findIndex(session => session.sessionId.equals(sessionId));
+function deleteSession(sessionId: string): boolean {
+    const index = sessions.findIndex(session => session.sessionId === sessionId);
     if (index !== -1) {
         sessions.splice(index, 1);
         return true;
@@ -113,6 +129,7 @@ export {
     getAllSessions,
     getSessionByID,
     getSessionByCreatorID,
+    getNewSessionID,
     updateSession,
     deleteSession,
     getSession

src/models/friendModel.ts

@@ -1,15 +0,0 @@
-import { IFriendship } from "@/src/types/friendTypes";
-import { model, Schema } from "mongoose";
-
-const friendshipSchema = new Schema<IFriendship>({
-    owner: { type: Schema.Types.ObjectId, required: true },
-    friend: { type: Schema.Types.ObjectId, required: true },
-    Note: String,
-    Favorite: Boolean
-});
-
-friendshipSchema.index({ owner: 1 });
-friendshipSchema.index({ friend: 1 });
-friendshipSchema.index({ owner: 1, friend: 1 }, { unique: true });
-
-export const Friendship = model<IFriendship>("Friendship", friendshipSchema);

src/models/guildModel.ts

@@ -13,8 +13,7 @@ import {
     IDojoLeaderboardEntry,
     IGuildAdDatabase,
     IAllianceDatabase,
-    IAllianceMemberDatabase,
-    GuildPermission
+    IAllianceMemberDatabase
 } from "@/src/types/guildTypes";
 import { Document, Model, model, Schema, Types } from "mongoose";
 import { fusionTreasuresSchema, typeCountSchema } from "./inventoryModels/inventoryModel";
@@ -24,7 +23,6 @@ const dojoDecoSchema = new Schema<IDojoDecoDatabase>({
     Type: String,
     Pos: [Number],
     Rot: [Number],
-    Scale: Number,
     Name: String,
     Sockets: Number,
     RegularCredits: Number,
@@ -109,31 +107,31 @@ const defaultRanks: IGuildRank[] = [
     },
     {
         Name: "/Lotus/Language/Game/Rank_General",
-        Permissions: GuildPermission.Host | 4318
+        Permissions: 4318
     },
     {
         Name: "/Lotus/Language/Game/Rank_Officer",
-        Permissions: GuildPermission.Host | 4314
+        Permissions: 4314
     },
     {
         Name: "/Lotus/Language/Game/Rank_Leader",
-        Permissions: GuildPermission.Host | 4106
+        Permissions: 4106
     },
     {
         Name: "/Lotus/Language/Game/Rank_Sage",
-        Permissions: GuildPermission.Host | 4304
+        Permissions: 4304
     },
     {
         Name: "/Lotus/Language/Game/Rank_Soldier",
-        Permissions: GuildPermission.Host | 4098
+        Permissions: 4098
     },
     {
         Name: "/Lotus/Language/Game/Rank_Initiate",
-        Permissions: GuildPermission.Host | GuildPermission.Fabricator
+        Permissions: 4096
     },
     {
         Name: "/Lotus/Language/Game/Rank_Utility",
-        Permissions: GuildPermission.Host | GuildPermission.Fabricator
+        Permissions: 4096
     }
 ];
 

src/models/inventoryModels/inventoryModel.ts

@@ -38,8 +38,7 @@ import {
     IPeriodicMissionCompletionResponse,
     ILoreFragmentScan,
     IEvolutionProgress,
-    IEndlessXpProgressDatabase,
-    IEndlessXpProgressClient,
+    IEndlessXpProgress,
     ICrewShipCustomization,
     ICrewShipWeapon,
     ICrewShipWeaponEmplacements,
@@ -97,9 +96,7 @@ import {
     IInvasionProgressDatabase,
     IInvasionProgressClient,
     IAccolades,
-    IHubNpcCustomization,
-    ILotusCustomization,
-    IEndlessXpReward
+    IHubNpcCustomization
 } from "../../types/inventoryTypes/inventoryTypes";
 import { IOid } from "../../types/commonTypes";
 import {
@@ -114,7 +111,6 @@ import {
 } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers";
 import { EquipmentSelectionSchema, oidSchema } from "./loadoutModel";
-import { ICountedStoreItem } from "warframe-public-export-plus";
 
 export const typeCountSchema = new Schema<ITypeCount>({ ItemType: String, ItemCount: Number }, { _id: false });
 
@@ -394,8 +390,8 @@ MailboxSchema.set("toJSON", {
 
 const DuviriInfoSchema = new Schema<IDuviriInfo>(
     {
-        Seed: { type: BigInt, required: true },
-        NumCompletions: { type: Number, required: true }
+        Seed: Number,
+        NumCompletions: { type: Number, default: 0 }
     },
     {
         _id: false,
@@ -784,26 +780,6 @@ const loreFragmentScansSchema = new Schema<ILoreFragmentScan>(
     { _id: false }
 );
 
-// const lotusCustomizationSchema = new Schema<ILotusCustomization>().add(ItemConfigSchema).add({
-//     Persona: String
-// });
-
-// Laxer schema for cleanupInventory
-const lotusCustomizationSchema = new Schema<ILotusCustomization>(
-    {
-        Skins: [String],
-        pricol: colorSchema,
-        attcol: Schema.Types.Mixed,
-        sigcol: Schema.Types.Mixed,
-        eyecol: Schema.Types.Mixed,
-        facial: Schema.Types.Mixed,
-        cloth: Schema.Types.Mixed,
-        syancol: Schema.Types.Mixed,
-        Persona: String
-    },
-    { _id: false }
-);
-
 const evolutionProgressSchema = new Schema<IEvolutionProgress>(
     {
         Progress: Number,
@@ -813,48 +789,14 @@ const evolutionProgressSchema = new Schema<IEvolutionProgress>(
     { _id: false }
 );
 
-const countedStoreItemSchema = new Schema<ICountedStoreItem>(
+const endlessXpProgressSchema = new Schema<IEndlessXpProgress>(
     {
-        StoreItem: String,
-        ItemCount: Number
+        Category: String,
+        Choices: [String]
     },
     { _id: false }
 );
 
-const endlessXpRewardSchema = new Schema<IEndlessXpReward>(
-    {
-        RequiredTotalXp: Number,
-        Rewards: [countedStoreItemSchema]
-    },
-    { _id: false }
-);
-
-const endlessXpProgressSchema = new Schema<IEndlessXpProgressDatabase>(
-    {
-        Category: { type: String, required: true },
-        Earn: { type: Number, default: 0 },
-        Claim: { type: Number, default: 0 },
-        BonusAvailable: Date,
-        Expiry: Date,
-        Choices: { type: [String], required: true },
-        PendingRewards: { type: [endlessXpRewardSchema], default: [] }
-    },
-    { _id: false }
-);
-
-endlessXpProgressSchema.set("toJSON", {
-    transform(_doc, ret) {
-        const db = ret as IEndlessXpProgressDatabase;
-        const client = ret as IEndlessXpProgressClient;
-
-        if (db.BonusAvailable) {
-            client.BonusAvailable = toMongoDate(db.BonusAvailable);
-        }
-        if (db.Expiry) {
-            client.Expiry = toMongoDate(db.Expiry);
-        }
-    }
-});
 const crewShipWeaponEmplacementsSchema = new Schema<ICrewShipWeaponEmplacements>(
     {
         PRIMARY_A: EquipmentSelectionSchema,
@@ -1092,13 +1034,10 @@ const pendingRecipeSchema = new Schema<IPendingRecipeDatabase>(
     {
         ItemType: String,
         CompletionDate: Date,
-        TargetItemId: String,
-        TargetFingerprint: String,
         LongGuns: { type: [EquipmentSchema], default: undefined },
         Pistols: { type: [EquipmentSchema], default: undefined },
         Melee: { type: [EquipmentSchema], default: undefined },
-        SuitToUnbrand: { type: Schema.Types.ObjectId, default: undefined },
-        KubrowPet: { type: Schema.Types.ObjectId, default: undefined }
+        SuitToUnbrand: { type: Schema.Types.ObjectId, default: undefined }
     },
     { id: false }
 );
@@ -1116,7 +1055,6 @@ pendingRecipeSchema.set("toJSON", {
         delete returnedObject.Pistols;
         delete returnedObject.Melees;
         delete returnedObject.SuitToUnbrand;
-        delete returnedObject.KubrowPet;
         (returnedObject as IPendingRecipeClient).CompletionDate = {
             $date: { $numberLong: (returnedObject as IPendingRecipeDatabase).CompletionDate.getTime().toString() }
         };
@@ -1187,15 +1125,15 @@ const CustomMarkersSchema = new Schema<ICustomMarkers>(
 const calenderProgressSchema = new Schema<ICalendarProgress>(
     {
         Version: { type: Number, default: 19 },
-        Iteration: { type: Number, required: true },
+        Iteration: { type: Number, default: 2 },
         YearProgress: {
-            Upgrades: { type: [String], default: [] }
+            Upgrades: { type: [] }
         },
         SeasonProgress: {
-            SeasonType: { type: String, required: true },
-            LastCompletedDayIdx: { type: Number, default: 0 },
-            LastCompletedChallengeDayIdx: { type: Number, default: 0 },
-            ActivatedChallenges: { type: [String], default: [] }
+            SeasonType: String,
+            LastCompletedDayIdx: { type: Number, default: -1 },
+            LastCompletedChallengeDayIdx: { type: Number, default: -1 },
+            ActivatedChallenges: []
         }
     },
     { _id: false }
@@ -1317,11 +1255,11 @@ const nemesisSchema = new Schema<INemesisDatabase>(
         PrevOwners: Number,
         SecondInCommand: Boolean,
         Weakened: Boolean,
-        InfNodes: { type: [infNodeSchema], default: undefined },
+        InfNodes: [infNodeSchema],
         HenchmenKilled: Number,
         HintProgress: Number,
-        Hints: { type: [Number], default: [] },
-        GuessHistory: { type: [Number], default: undefined },
+        Hints: [Number],
+        GuessHistory: [Number],
         MissionCount: Number,
         LastEnc: Number
     },
@@ -1438,7 +1376,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //How many Gift do you have left*(gift spends the trade)
         GiftsRemaining: { type: Number, default: 8 },
         //Curent trade info Giving or Getting items
-        //PendingTrades: [Schema.Types.Mixed],
+        PendingTrades: [Schema.Types.Mixed],
 
         //Syndicate currently being pledged to.
         SupportedSyndicate: String,
@@ -1488,7 +1426,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         KubrowPetEggs: [kubrowPetEggSchema],
         //Prints   Cat(3 Prints)\Kubrow(2 Prints) Pets
-        //KubrowPetPrints: [Schema.Types.Mixed],
+        KubrowPetPrints: [Schema.Types.Mixed],
 
         //Item for EquippedGear example:Scaner,LoadoutTechSummon etc
         Consumables: [typeCountSchema],
@@ -1534,7 +1472,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //item like DojoKey or Boss missions key
         LevelKeys: [typeCountSchema],
         //Active quests
-        //Quests: [Schema.Types.Mixed],
+        Quests: [Schema.Types.Mixed],
 
         //Cosmetics like profile glyphs\Kavasa Prime Kubrow Collar\Game Theme etc
         FlavourItems: [FlavourItemSchema],
@@ -1573,7 +1511,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         TauntHistory: { type: [tauntSchema], default: undefined },
 
         //noShow2FA,VisitPrimeVault etc
-        //WebFlags: Schema.Types.Mixed,
+        WebFlags: Schema.Types.Mixed,
         //Id CompletedAlerts
         CompletedAlerts: [String],
 
@@ -1593,7 +1531,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //the color your clan requests like Items/Research/DojoColors/DojoColorPlainsB
         ActiveDojoColorResearch: String,
 
-        //SentientSpawnChanceBoosters: Schema.Types.Mixed,
+        SentientSpawnChanceBoosters: Schema.Types.Mixed,
 
         QualifyingInvasions: [invasionProgressSchema],
         FactionScores: [Number],
@@ -1623,15 +1561,15 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         Drones: [droneSchema],
 
         //Active profile ico
-        ActiveAvatarImageType: String,
+        ActiveAvatarImageType: { type: String, default: "/Lotus/Types/StoreItems/AvatarImages/AvatarImageDefault" },
 
         // open location store like EidolonPlainsDiscoverable or OrbVallisCaveDiscoverable
         DiscoveredMarkers: [discoveredMarkerSchema],
         //Open location mission like "JobId" + "StageCompletions"
-        //CompletedJobs: [Schema.Types.Mixed],
+        CompletedJobs: [Schema.Types.Mixed],
 
         //Game mission\ivent score example  "Tag": "WaterFight", "Best": 170, "Count": 1258,
-        //PersonalGoalProgress: [Schema.Types.Mixed],
+        PersonalGoalProgress: [Schema.Types.Mixed],
 
         //Setting interface Style
         ThemeStyle: String,
@@ -1661,13 +1599,13 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         LibraryActiveDailyTaskInfo: libraryDailyTaskInfoSchema,
 
         //https://warframe.fandom.com/wiki/Invasion
-        //InvasionChainProgress: [Schema.Types.Mixed],
+        InvasionChainProgress: [Schema.Types.Mixed],
 
         //CorpusLich or GrineerLich
         NemesisAbandonedRewards: { type: [String], default: [] },
         Nemesis: nemesisSchema,
-        NemesisHistory: { type: [nemesisSchema], default: undefined },
-        //LastNemesisAllySpawnTime: Schema.Types.Mixed,
+        NemesisHistory: [Schema.Types.Mixed],
+        LastNemesisAllySpawnTime: Schema.Types.Mixed,
 
         //TradingRulesConfirmed,ShowFriendInvNotifications(Option->Social)
         Settings: settingsSchema,
@@ -1681,7 +1619,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         PlayerSkills: { type: playerSkillsSchema, default: {} },
 
         //TradeBannedUntil data
-        //TradeBannedUntil: Schema.Types.Mixed,
+        TradeBannedUntil: Schema.Types.Mixed,
 
         //https://warframe.fandom.com/wiki/Helminth
         InfestedFoundry: infestedFoundrySchema,
@@ -1690,7 +1628,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         //Purchase this new permanent skin from the Lotus customization options in Personal Quarters located in your Orbiter.
         //https://warframe.fandom.com/wiki/Lotus#The_New_War
-        LotusCustomization: { type: lotusCustomizationSchema, default: undefined },
+        LotusCustomization: Schema.Types.Mixed,
 
         //Progress+Rank+ItemType(ZarimanPumpShotgun)
         //https://warframe.fandom.com/wiki/Incarnon
@@ -1701,24 +1639,23 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         //Unknown and system
         DuviriInfo: DuviriInfoSchema,
-        LastInventorySync: Schema.Types.ObjectId,
         Mailbox: MailboxSchema,
         HandlerPoints: Number,
         ChallengesFixVersion: { type: Number, default: 6 },
         PlayedParkourTutorial: Boolean,
-        //ActiveLandscapeTraps: [Schema.Types.Mixed],
-        //RepVotes: [Schema.Types.Mixed],
-        //LeagueTickets: [Schema.Types.Mixed],
+        ActiveLandscapeTraps: [Schema.Types.Mixed],
+        RepVotes: [Schema.Types.Mixed],
+        LeagueTickets: [Schema.Types.Mixed],
         HasContributedToDojo: Boolean,
         HWIDProtectEnabled: Boolean,
         LoadOutPresets: { type: Schema.Types.ObjectId, ref: "Loadout" },
         CurrentLoadOutIds: [oidSchema],
         RandomUpgradesIdentified: Number,
         BountyScore: Number,
-        //ChallengeInstanceStates: [Schema.Types.Mixed],
+        ChallengeInstanceStates: [Schema.Types.Mixed],
         RecentVendorPurchases: { type: [recentVendorPurchaseSchema], default: undefined },
-        //Robotics: [Schema.Types.Mixed],
-        //UsedDailyDeals: [Schema.Types.Mixed],
+        Robotics: [Schema.Types.Mixed],
+        UsedDailyDeals: [Schema.Types.Mixed],
         CollectibleSeries: { type: [collectibleEntrySchema], default: undefined },
         HasResetAccount: { type: Boolean, default: false },
 
@@ -1799,9 +1736,6 @@ inventorySchema.set("toJSON", {
                 sn: inventoryDatabase.LockedWeaponGroup.sn ? toOid(inventoryDatabase.LockedWeaponGroup.sn) : undefined
             };
         }
-        if (inventoryDatabase.LastInventorySync) {
-            inventoryResponse.LastInventorySync = toOid(inventoryDatabase.LastInventorySync);
-        }
     }
 });
 

src/models/loginModel.ts

@@ -20,9 +20,7 @@ const databaseAccountSchema = new Schema<IDatabaseAccountJson>(
         ConsentNeeded: { type: Boolean, required: true },
         TrackedSettings: { type: [String], default: [] },
         Nonce: { type: Number, default: 0 },
-        BuildLabel: String,
         Dropped: Boolean,
-        LastLogin: { type: Date, default: 0 },
         LatestEventMessageDate: { type: Date, default: 0 },
         LastLoginRewardDate: { type: Number, default: 0 },
         LoginDays: { type: Number, default: 1 }

src/models/personalRoomsModel.ts

@@ -1,19 +1,16 @@
-import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers";
+import { toOid } from "@/src/helpers/inventoryHelpers";
 import { colorSchema } from "@/src/models/inventoryModels/inventoryModel";
 import { IOrbiter, IPersonalRoomsDatabase, PersonalRoomsModelType } from "@/src/types/personalRoomsTypes";
 import {
     IFavouriteLoadoutDatabase,
-    IGardeningDatabase,
+    IGardening,
     IPlacedDecosDatabase,
     IPictureFrameInfo,
     IRoom,
     ITailorShopDatabase,
-    IApartmentDatabase,
-    IPlanterDatabase,
-    IPlantDatabase,
-    IPlantClient
+    IApartmentDatabase
 } from "@/src/types/shipTypes";
-import { Schema, Types, model } from "mongoose";
+import { Schema, model } from "mongoose";
 
 export const pictureFrameInfoSchema = new Schema<IPictureFrameInfo>(
     {
@@ -80,45 +77,15 @@ favouriteLoadoutSchema.set("toJSON", {
     }
 });
 
-const plantSchema = new Schema<IPlantDatabase>(
-    {
-        PlantType: String,
-        EndTime: Date,
-        PlotIndex: Number
-    },
-    { _id: false }
-);
-
-plantSchema.set("toJSON", {
-    virtuals: true,
-    transform(_doc, obj) {
-        const client = obj as IPlantClient;
-        const db = obj as IPlantDatabase;
-
-        client.EndTime = toMongoDate(db.EndTime);
-    }
+const gardeningSchema = new Schema<IGardening>({
+    Planters: [Schema.Types.Mixed] //TODO: add when implementing gardening
 });
 
-const planterSchema = new Schema<IPlanterDatabase>(
-    {
-        Name: { type: String, required: true },
-        Plants: { type: [plantSchema], default: [] }
-    },
-    { _id: false }
-);
-
-const gardeningSchema = new Schema<IGardeningDatabase>(
-    {
-        Planters: { type: [planterSchema], default: [] }
-    },
-    { _id: false }
-);
-
 const apartmentSchema = new Schema<IApartmentDatabase>(
     {
         Rooms: [roomSchema],
         FavouriteLoadouts: [favouriteLoadoutSchema],
-        Gardening: gardeningSchema
+        Gardening: gardeningSchema // TODO: ensure this is correct
     },
     { _id: false }
 );
@@ -131,9 +98,7 @@ const apartmentDefault: IApartmentDatabase = {
         { Name: "DuviriHallway", MaxCapacity: 1600 }
     ],
     FavouriteLoadouts: [],
-    Gardening: {
-        Planters: []
-    }
+    Gardening: {}
 };
 
 const orbiterSchema = new Schema<IOrbiter>(
@@ -153,18 +118,7 @@ const orbiterDefault: IOrbiter = {
     Features: ["/Lotus/Types/Items/ShipFeatureItems/EarthNavigationFeatureItem"], //TODO: potentially remove after missionstarting gear
     Rooms: [
         { Name: "AlchemyRoom", MaxCapacity: 1600 },
-        {
-            Name: "BridgeRoom",
-            MaxCapacity: 1600,
-            PlacedDecos: [
-                {
-                    Type: "/Lotus/Objects/Tenno/Props/Ships/LandCraftPlayerProps/ConclaveConsolePlayerShipDeco",
-                    Pos: [-30.082, -3.95954, -16.7913],
-                    Rot: [-135, 0, 0],
-                    _id: undefined as unknown as Types.ObjectId
-                }
-            ]
-        },
+        { Name: "BridgeRoom", MaxCapacity: 1600 },
         { Name: "LisetRoom", MaxCapacity: 1000 },
         { Name: "OperatorChamberRoom", MaxCapacity: 1600 },
         { Name: "OutsideRoom", MaxCapacity: 1600 },

src/models/shipModel.ts

@@ -28,15 +28,17 @@ shipSchema.set("toJSON", {
         delete returnedObject._id;
         delete returnedObject.__v;
         delete returnedObject.ShipOwnerId;
+        if (shipDatabase.ShipExteriorColors) {
+            shipResponse.ShipExterior = {
+                Colors: shipDatabase.ShipExteriorColors,
+                ShipAttachments: shipDatabase.ShipAttachments,
+                SkinFlavourItem: shipDatabase.SkinFlavourItem
+            };
 
-        shipResponse.ShipExterior = {
-            Colors: shipDatabase.ShipExteriorColors,
-            ShipAttachments: shipDatabase.ShipAttachments,
-            SkinFlavourItem: shipDatabase.SkinFlavourItem
-        };
-        delete shipDatabase.ShipExteriorColors;
-        delete shipDatabase.ShipAttachments;
-        delete shipDatabase.SkinFlavourItem;
+            delete shipDatabase.ShipExteriorColors;
+            delete shipDatabase.ShipAttachments;
+            delete shipDatabase.SkinFlavourItem;
+        }
     }
 });
 

src/routes/api.ts

@@ -3,13 +3,10 @@ import { abandonLibraryDailyTaskController } from "@/src/controllers/api/abandon
 import { abortDojoComponentController } from "@/src/controllers/api/abortDojoComponentController";
 import { abortDojoComponentDestructionController } from "@/src/controllers/api/abortDojoComponentDestructionController";
 import { activateRandomModController } from "@/src/controllers/api/activateRandomModController";
-import { addFriendController } from "@/src/controllers/api/addFriendController";
 import { addFriendImageController } from "@/src/controllers/api/addFriendImageController";
 import { addIgnoredUserController } from "@/src/controllers/api/addIgnoredUserController";
-import { addPendingFriendController } from "@/src/controllers/api/addPendingFriendController";
 import { addToAllianceController } from "@/src/controllers/api/addToAllianceController";
 import { addToGuildController } from "@/src/controllers/api/addToGuildController";
-import { adoptPetController } from "@/src/controllers/api/adoptPetController";
 import { arcaneCommonController } from "@/src/controllers/api/arcaneCommonController";
 import { archonFusionController } from "@/src/controllers/api/archonFusionController";
 import { artifactsController } from "@/src/controllers/api/artifactsController";
@@ -22,7 +19,6 @@ import { claimCompletedRecipeController } from "@/src/controllers/api/claimCompl
 import { claimLibraryDailyTaskRewardController } from "@/src/controllers/api/claimLibraryDailyTaskRewardController";
 import { clearDialogueHistoryController } from "@/src/controllers/api/clearDialogueHistoryController";
 import { clearNewEpisodeRewardController } from "@/src/controllers/api/clearNewEpisodeRewardController";
-import { completeCalendarEventController } from "@/src/controllers/api/completeCalendarEventController";
 import { completeRandomModChallengeController } from "@/src/controllers/api/completeRandomModChallengeController";
 import { confirmAllianceInvitationController } from "@/src/controllers/api/confirmAllianceInvitationController";
 import { confirmGuildInvitationGetController, confirmGuildInvitationPostController } from "@/src/controllers/api/confirmGuildInvitationController";
@@ -51,7 +47,6 @@ import { findSessionsController } from "@/src/controllers/api/findSessionsContro
 import { fishmongerController } from "@/src/controllers/api/fishmongerController";
 import { focusController } from "@/src/controllers/api/focusController";
 import { fusionTreasuresController } from "@/src/controllers/api/fusionTreasuresController";
-import { gardeningController } from "@/src/controllers/api/gardeningController";
 import { genericUpdateController } from "@/src/controllers/api/genericUpdateController";
 import { getAllianceController } from "@/src/controllers/api/getAllianceController";
 import { getDailyDealStockLevelsController } from "@/src/controllers/api/getDailyDealStockLevelsController";
@@ -62,7 +57,6 @@ import { getGuildDojoController } from "@/src/controllers/api/getGuildDojoContro
 import { getGuildLogController } from "@/src/controllers/api/getGuildLogController";
 import { getIgnoredUsersController } from "@/src/controllers/api/getIgnoredUsersController";
 import { getNewRewardSeedController } from "@/src/controllers/api/getNewRewardSeedController";
-import { getProfileViewingDataPostController } from "@/src/controllers/dynamic/getProfileViewingDataController";
 import { getShipController } from "@/src/controllers/api/getShipController";
 import { getVendorInfoController } from "@/src/controllers/api/getVendorInfoController";
 import { getVoidProjectionRewardsController } from "@/src/controllers/api/getVoidProjectionRewardsController";
@@ -100,15 +94,12 @@ import { playerSkillsController } from "@/src/controllers/api/playerSkillsContro
 import { postGuildAdvertisementController } from "@/src/controllers/api/postGuildAdvertisementController";
 import { projectionManagerController } from "@/src/controllers/api/projectionManagerController";
 import { purchaseController } from "@/src/controllers/api/purchaseController";
-import { questControlController } from "@/src/controllers/api/questControlController";
 import { queueDojoComponentDestructionController } from "@/src/controllers/api/queueDojoComponentDestructionController";
 import { redeemPromoCodeController } from "@/src/controllers/api/redeemPromoCodeController";
 import { releasePetController } from "@/src/controllers/api/releasePetController";
-import { removeFriendGetController, removeFriendPostController } from "@/src/controllers/api/removeFriendController";
 import { removeFromAllianceController } from "@/src/controllers/api/removeFromAllianceController";
 import { removeFromGuildController } from "@/src/controllers/api/removeFromGuildController";
 import { removeIgnoredUserController } from "@/src/controllers/api/removeIgnoredUserController";
-import { renamePetController } from "@/src/controllers/api/renamePetController";
 import { rerollRandomModController } from "@/src/controllers/api/rerollRandomModController";
 import { retrievePetFromStasisController } from "@/src/controllers/api/retrievePetFromStasisController";
 import { saveDialogueController } from "@/src/controllers/api/saveDialogueController";
@@ -125,7 +116,6 @@ import { setDojoComponentColorsController } from "@/src/controllers/api/setDojoC
 import { setDojoComponentMessageController } from "@/src/controllers/api/setDojoComponentMessageController";
 import { setDojoComponentSettingsController } from "@/src/controllers/api/setDojoComponentSettingsController";
 import { setEquippedInstrumentController } from "@/src/controllers/api/setEquippedInstrumentController";
-import { setFriendNoteController } from "@/src/controllers/api/setFriendNoteController";
 import { setGuildMotdController } from "@/src/controllers/api/setGuildMotdController";
 import { setHubNpcCustomizationsController } from "@/src/controllers/api/setHubNpcCustomizationsController";
 import { setPlacedDecoInfoController } from "@/src/controllers/api/setPlacedDecoInfoController";
@@ -168,7 +158,6 @@ apiRouter.get("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.get("/changeGuildRank.php", changeGuildRankController);
 apiRouter.get("/checkDailyMissionBonus.php", checkDailyMissionBonusController);
 apiRouter.get("/claimLibraryDailyTaskReward.php", claimLibraryDailyTaskRewardController);
-apiRouter.get("/completeCalendarEvent.php", completeCalendarEventController);
 apiRouter.get("/confirmAllianceInvitation.php", confirmAllianceInvitationController);
 apiRouter.get("/confirmGuildInvitation.php", confirmGuildInvitationGetController);
 apiRouter.get("/credits.php", creditsController);
@@ -178,7 +167,6 @@ apiRouter.get("/deleteSession.php", deleteSessionController);
 apiRouter.get("/divvyAllianceVault.php", divvyAllianceVaultController);
 apiRouter.get("/dojo", dojoController);
 apiRouter.get("/drones.php", dronesController);
-apiRouter.get("/getAlliance.php", getAllianceController);
 apiRouter.get("/getDailyDealStockLevels.php", getDailyDealStockLevelsController);
 apiRouter.get("/getFriends.php", getFriendsController);
 apiRouter.get("/getGuild.php", getGuildController);
@@ -186,10 +174,8 @@ apiRouter.get("/getGuildContributions.php", getGuildContributionsController);
 apiRouter.get("/getGuildDojo.php", getGuildDojoController);
 apiRouter.get("/getGuildLog.php", getGuildLogController);
 apiRouter.get("/getIgnoredUsers.php", getIgnoredUsersController);
-apiRouter.get("/getMessages.php", inboxController); // unsure if this is correct, but needed for U17
 apiRouter.get("/getNewRewardSeed.php", getNewRewardSeedController);
 apiRouter.get("/getShip.php", getShipController);
-apiRouter.get("/getShipDecos.php", (_req, res) => { res.end(); }); // needed to log in on U22.8
 apiRouter.get("/getVendorInfo.php", getVendorInfoController);
 apiRouter.get("/hub", hubController);
 apiRouter.get("/hubInstances", hubInstancesController);
@@ -201,9 +187,7 @@ apiRouter.get("/marketRecommendations.php", marketRecommendationsController);
 apiRouter.get("/marketSearchRecommendations.php", marketRecommendationsController);
 apiRouter.get("/modularWeaponSale.php", modularWeaponSaleController);
 apiRouter.get("/playedParkourTutorial.php", playedParkourTutorialController);
-apiRouter.get("/questControl.php", questControlController);
 apiRouter.get("/queueDojoComponentDestruction.php", queueDojoComponentDestructionController);
-apiRouter.get("/removeFriend.php", removeFriendGetController);
 apiRouter.get("/removeFromAlliance.php", removeFromAllianceController);
 apiRouter.get("/setActiveQuest.php", setActiveQuestController);
 apiRouter.get("/setActiveShip.php", setActiveShipController);
@@ -221,13 +205,10 @@ apiRouter.get("/updateSession.php", updateSessionGetController);
 // post
 apiRouter.post("/abortDojoComponent.php", abortDojoComponentController);
 apiRouter.post("/activateRandomMod.php", activateRandomModController);
-apiRouter.post("/addFriend.php", addFriendController);
 apiRouter.post("/addFriendImage.php", addFriendImageController);
 apiRouter.post("/addIgnoredUser.php", addIgnoredUserController);
-apiRouter.post("/addPendingFriend.php", addPendingFriendController);
 apiRouter.post("/addToAlliance.php", addToAllianceController);
 apiRouter.post("/addToGuild.php", addToGuildController);
-apiRouter.post("/adoptPet.php", adoptPetController);
 apiRouter.post("/arcaneCommon.php", arcaneCommonController);
 apiRouter.post("/archonFusion.php", archonFusionController);
 apiRouter.post("/artifacts.php", artifactsController);
@@ -236,7 +217,6 @@ apiRouter.post("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.post("/claimCompletedRecipe.php", claimCompletedRecipeController);
 apiRouter.post("/clearDialogueHistory.php", clearDialogueHistoryController);
 apiRouter.post("/clearNewEpisodeReward.php", clearNewEpisodeRewardController);
-apiRouter.post("/commitStoryModeDecision.php", (_req, res) => { res.end(); }); // U14 (maybe wanna actually unlock the ship features?)
 apiRouter.post("/completeRandomModChallenge.php", completeRandomModChallengeController);
 apiRouter.post("/confirmGuildInvitation.php", confirmGuildInvitationPostController);
 apiRouter.post("/contributeGuildClass.php", contributeGuildClassController);
@@ -258,12 +238,10 @@ apiRouter.post("/findSessions.php", findSessionsController);
 apiRouter.post("/fishmonger.php", fishmongerController);
 apiRouter.post("/focus.php", focusController);
 apiRouter.post("/fusionTreasures.php", fusionTreasuresController);
-apiRouter.post("/gardening.php", gardeningController);
 apiRouter.post("/genericUpdate.php", genericUpdateController);
 apiRouter.post("/getAlliance.php", getAllianceController);
 apiRouter.post("/getFriends.php", getFriendsController);
 apiRouter.post("/getGuildDojo.php", getGuildDojoController);
-apiRouter.post("/getProfileViewingData.php", getProfileViewingDataPostController);
 apiRouter.post("/getVoidProjectionRewards.php", getVoidProjectionRewardsController);
 apiRouter.post("/gifting.php", giftingController);
 apiRouter.post("/gildWeapon.php", gildWeaponController);
@@ -291,13 +269,10 @@ apiRouter.post("/playerSkills.php", playerSkillsController);
 apiRouter.post("/postGuildAdvertisement.php", postGuildAdvertisementController);
 apiRouter.post("/projectionManager.php", projectionManagerController);
 apiRouter.post("/purchase.php", purchaseController);
-apiRouter.post("/questControl.php", questControlController); // U17
 apiRouter.post("/redeemPromoCode.php", redeemPromoCodeController);
 apiRouter.post("/releasePet.php", releasePetController);
-apiRouter.post("/removeFriend.php", removeFriendPostController);
 apiRouter.post("/removeFromGuild.php", removeFromGuildController);
 apiRouter.post("/removeIgnoredUser.php", removeIgnoredUserController);
-apiRouter.post("/renamePet.php", renamePetController);
 apiRouter.post("/rerollRandomMod.php", rerollRandomModController);
 apiRouter.post("/retrievePetFromStasis.php", retrievePetFromStasisController);
 apiRouter.post("/saveDialogue.php", saveDialogueController);
@@ -310,7 +285,6 @@ apiRouter.post("/setDojoComponentColors.php", setDojoComponentColorsController);
 apiRouter.post("/setDojoComponentMessage.php", setDojoComponentMessageController);
 apiRouter.post("/setDojoComponentSettings.php", setDojoComponentSettingsController);
 apiRouter.post("/setEquippedInstrument.php", setEquippedInstrumentController);
-apiRouter.post("/setFriendNote.php", setFriendNoteController);
 apiRouter.post("/setGuildMotd.php", setGuildMotdController);
 apiRouter.post("/setHubNpcCustomizations.php", setHubNpcCustomizationsController);
 apiRouter.post("/setPlacedDecoInfo.php", setPlacedDecoInfoController);
@@ -330,7 +304,6 @@ apiRouter.post("/trainingResult.php", trainingResultController);
 apiRouter.post("/unlockShipFeature.php", unlockShipFeatureController);
 apiRouter.post("/updateAlignment.php", updateAlignmentController);
 apiRouter.post("/updateChallengeProgress.php", updateChallengeProgressController);
-apiRouter.post("/updateInventory.php", missionInventoryUpdateController); // U26 and below
 apiRouter.post("/updateNodeIntros.php", genericUpdateController);
 apiRouter.post("/updateQuest.php", updateQuestController);
 apiRouter.post("/updateSession.php", updateSessionPostController);

src/routes/custom.ts

@@ -10,7 +10,6 @@ import { getAccountInfoController } from "@/src/controllers/custom/getAccountInf
 import { renameAccountController } from "@/src/controllers/custom/renameAccountController";
 import { ircDroppedController } from "@/src/controllers/custom/ircDroppedController";
 import { unlockAllIntrinsicsController } from "@/src/controllers/custom/unlockAllIntrinsicsController";
-import { addMissingMaxRankModsController } from "@/src/controllers/custom/addMissingMaxRankModsController";
 
 import { createAccountController } from "@/src/controllers/custom/createAccountController";
 import { createMessageController } from "@/src/controllers/custom/createMessageController";
@@ -18,12 +17,10 @@ import { addCurrencyController } from "@/src/controllers/custom/addCurrencyContr
 import { addItemsController } from "@/src/controllers/custom/addItemsController";
 import { addXpController } from "@/src/controllers/custom/addXpController";
 import { importController } from "@/src/controllers/custom/importController";
-import { manageQuestsController } from "@/src/controllers/custom/manageQuestsController";
-import { setEvolutionProgressController } from "@/src/controllers/custom/setEvolutionProgressController";
 
 import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController";
 import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController";
-import { setBoosterController } from "../controllers/custom/setBoosterController";
+import { manageQuestsController } from "@/src/controllers/custom/manageQuestsController";
 
 const customRouter = express.Router();
 
@@ -37,7 +34,6 @@ customRouter.get("/getAccountInfo", getAccountInfoController);
 customRouter.get("/renameAccount", renameAccountController);
 customRouter.get("/ircDropped", ircDroppedController);
 customRouter.get("/unlockAllIntrinsics", unlockAllIntrinsicsController);
-customRouter.get("/addMissingMaxRankMods", addMissingMaxRankModsController);
 
 customRouter.post("/createAccount", createAccountController);
 customRouter.post("/createMessage", createMessageController);
@@ -46,8 +42,6 @@ customRouter.post("/addItems", addItemsController);
 customRouter.post("/addXp", addXpController);
 customRouter.post("/import", importController);
 customRouter.post("/manageQuests", manageQuestsController);
-customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
-customRouter.post("/setBooster", setBoosterController);
 
 customRouter.get("/config", getConfigDataController);
 customRouter.post("/config", updateConfigDataController);

src/routes/dynamic.ts

@@ -1,14 +1,14 @@
 import express from "express";
 import { aggregateSessionsController } from "@/src/controllers/dynamic/aggregateSessionsController";
 import { getGuildAdsController } from "@/src/controllers/dynamic/getGuildAdsController";
-import { getProfileViewingDataGetController } from "@/src/controllers/dynamic/getProfileViewingDataController";
+import { getProfileViewingDataController } from "@/src/controllers/dynamic/getProfileViewingDataController";
 import { worldStateController } from "@/src/controllers/dynamic/worldStateController";
 
 const dynamicController = express.Router();
 
 dynamicController.get("/aggregateSessions.php", aggregateSessionsController);
 dynamicController.get("/getGuildAds.php", getGuildAdsController);
-dynamicController.get("/getProfileViewingData.php", getProfileViewingDataGetController);
+dynamicController.get("/getProfileViewingData.php", getProfileViewingDataController);
 dynamicController.get("/worldState.php", worldStateController);
 
 export { dynamicController };

src/services/configService.ts

@@ -24,9 +24,6 @@ interface IConfig {
     infiniteEndo?: boolean;
     infiniteRegalAya?: boolean;
     infiniteHelminthMaterials?: boolean;
-    claimingBlueprintRefundsIngredients?: boolean;
-    dontSubtractVoidTraces?: boolean;
-    dontSubtractConsumables?: boolean;
     unlockAllShipFeatures?: boolean;
     unlockAllShipDecorations?: boolean;
     unlockAllFlavourItems?: boolean;
@@ -44,11 +41,8 @@ interface IConfig {
     noVendorPurchaseLimits?: boolean;
     noDeathMarks?: boolean;
     noKimCooldowns?: boolean;
-    syndicateMissionsRepeatable?: boolean;
-    instantFinishRivenChallenge?: boolean;
     instantResourceExtractorDrones?: boolean;
     noResourceExtractorDronesDamage?: boolean;
-    skipClanKeyCrafting?: boolean;
     noDojoRoomBuildStage?: boolean;
     noDojoDecoBuildStage?: boolean;
     fastDojoRoomDestruction?: boolean;
@@ -56,18 +50,12 @@ interface IConfig {
     noDojoResearchTime?: boolean;
     fastClanAscension?: boolean;
     spoofMasteryRank?: number;
-    nightwaveStandingMultiplier?: number;
     worldState?: {
         creditBoost?: boolean;
         affinityBoost?: boolean;
         resourceBoost?: boolean;
         starDays?: boolean;
-        eidolonOverride?: string;
-        vallisOverride?: string;
-        nightwaveOverride?: string;
-    };
-    dev?: {
-        keepVendorsExpired?: boolean;
+        lockTime?: number;
     };
 }
 

src/services/configWatcherService.ts

@@ -2,7 +2,6 @@ import fs from "fs";
 import fsPromises from "fs/promises";
 import { logger } from "../utils/logger";
 import { config, configPath, loadConfig } from "./configService";
-import { getWebPorts, startWebServer, stopWebServer } from "./webService";
 
 let amnesia = false;
 fs.watchFile(configPath, () => {
@@ -17,31 +16,13 @@ fs.watchFile(configPath, () => {
             process.exit(1);
         }
         validateConfig();
-
-        const webPorts = getWebPorts();
-        if (config.httpPort != webPorts.http || config.httpsPort != webPorts.https) {
-            logger.info(`Restarting web server to apply port changes.`);
-            void stopWebServer().then(startWebServer);
-        }
     }
 });
 
 export const validateConfig = (): void => {
-    let modified = false;
-    if (config.administratorNames) {
-        if (!Array.isArray(config.administratorNames)) {
-            config.administratorNames = [config.administratorNames];
-            modified = true;
-        }
-        for (let i = 0; i != config.administratorNames.length; ++i) {
-            if (typeof config.administratorNames[i] != "string") {
-                config.administratorNames[i] = String(config.administratorNames[i]);
-                modified = true;
-            }
-        }
-    }
-    if (modified) {
-        logger.info(`Updating config.json to fix some issues with it.`);
+    if (typeof config.administratorNames == "string") {
+        logger.info(`Updating config.json to make administratorNames an array.`);
+        config.administratorNames = [config.administratorNames];
         void saveConfig();
     }
 };