From a62e8eebc2b8665bb735d65f34103cfa7e9a6169 Mon Sep 17 00:00:00 2001 From: Sainan Date: Tue, 18 Feb 2025 05:24:28 -0800 Subject: [PATCH 1/3] chore: log missionInventoryUpdate request body (#961) there's still so much uncertainty about this, this is vital information to have logged by default, imo Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/961 Co-authored-by: Sainan Co-committed-by: Sainan --- src/controllers/api/missionInventoryUpdateController.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index c5daaacf..39bf8180 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -5,6 +5,7 @@ import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes"; import { addMissionInventoryUpdates, addMissionRewards } from "@/src/services/missionInventoryUpdateService"; import { getInventory } from "@/src/services/inventoryService"; import { getInventoryResponse } from "./inventoryController"; +import { logger } from "@/src/utils/logger"; /* **** INPUT **** @@ -50,6 +51,7 @@ import { getInventoryResponse } from "./inventoryController"; export const missionInventoryUpdateController: RequestHandler = async (req, res): Promise => { const accountId = await getAccountIdForRequest(req); const missionReport = getJSONfromString((req.body as string).toString()); + logger.debug("mission report:", missionReport); const inventory = await getInventory(accountId); const inventoryUpdates = addMissionInventoryUpdates(inventory, missionReport); From c8542c9d75b086caf43c31c4d599f04558767317 Mon Sep 17 00:00:00 2001 From: Sainan Date: Tue, 18 Feb 2025 05:39:24 -0800 Subject: [PATCH 2/3] chore: update PE+, add countedAtt to key chain triggered messages (#959) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/959 Co-authored-by: Sainan Co-committed-by: Sainan --- package-lock.json | 8 ++++---- package.json | 2 +- .../api/giveKeyChainTriggeredMessageController.ts | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index efccae62..ec52be41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "copyfiles": "^2.4.1", "express": "^5", "mongoose": "^8.9.4", - "warframe-public-export-plus": "^0.5.29", + "warframe-public-export-plus": "^0.5.30", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" @@ -4093,9 +4093,9 @@ } }, "node_modules/warframe-public-export-plus": { - "version": "0.5.29", - "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.29.tgz", - "integrity": "sha512-D61CFiJTr/LIQCvyZ03DgudUBpJDqrOTdNPNeB0kY21lmPHw1auDg4CNW2T1JaG0nL5K1hu9ypvnfXzno2omMA==" + "version": "0.5.30", + "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.30.tgz", + "integrity": "sha512-vzs+naEqp3iFZTbgIky4jiNbjNIovuR4oSimrFiuyIbrnfTlfXFzDfzT0hG2rgS8yEXBAbOcv2Zfm3fmWuZ0Kg==" }, "node_modules/warframe-riven-info": { "version": "0.1.2", diff --git a/package.json b/package.json index 33fac27b..d26bee37 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "copyfiles": "^2.4.1", "express": "^5", "mongoose": "^8.9.4", - "warframe-public-export-plus": "^0.5.29", + "warframe-public-export-plus": "^0.5.30", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" diff --git a/src/controllers/api/giveKeyChainTriggeredMessageController.ts b/src/controllers/api/giveKeyChainTriggeredMessageController.ts index c1216bc0..0f699d42 100644 --- a/src/controllers/api/giveKeyChainTriggeredMessageController.ts +++ b/src/controllers/api/giveKeyChainTriggeredMessageController.ts @@ -18,6 +18,7 @@ export const giveKeyChainTriggeredMessageController: RequestHandler = async (req msg: keyChainMessage.body, sub: keyChainMessage.title, att: keyChainMessage.attachments.length > 0 ? keyChainMessage.attachments : undefined, + countedAtt: keyChainMessage.countedAttachments.length > 0 ? keyChainMessage.countedAttachments : undefined, icon: keyChainMessage.icon ?? "", transmission: keyChainMessage.transmission ?? "", highPriority: keyChainMessage.highPriority ?? false, From cd100c87b892bff96e3d1fd1226d20aeb6bad724 Mon Sep 17 00:00:00 2001 From: Sainan Date: Tue, 18 Feb 2025 05:39:45 -0800 Subject: [PATCH 3/3] fix: respect purchaseQuantity when giving gear items from inbox message (#960) Closes #942 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/960 Co-authored-by: Sainan Co-committed-by: Sainan --- src/controllers/api/inboxController.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/controllers/api/inboxController.ts b/src/controllers/api/inboxController.ts index d604f253..896c01b6 100644 --- a/src/controllers/api/inboxController.ts +++ b/src/controllers/api/inboxController.ts @@ -10,6 +10,7 @@ import { import { getAccountIdForRequest } from "@/src/services/loginService"; import { addItems, getInventory } from "@/src/services/inventoryService"; import { logger } from "@/src/utils/logger"; +import { ExportGear } from "warframe-public-export-plus"; export const inboxController: RequestHandler = async (req, res) => { const { deleteId, lastMessage: latestClientMessageId, messageId } = req.query; @@ -43,7 +44,10 @@ export const inboxController: RequestHandler = async (req, res) => { if (attachmentItems) { await addItems( inventory, - attachmentItems.map(attItem => ({ ItemType: attItem, ItemCount: 1 })), + attachmentItems.map(attItem => ({ + ItemType: attItem, + ItemCount: attItem in ExportGear ? (ExportGear[attItem].purchaseQuantity ?? 1) : 1 + })), inventoryChanges ); }