From 48c604d1ec70707f4f27b9e974d2e7e098185d68 Mon Sep 17 00:00:00 2001 From: Ordis <134585663+OrdisPrime@users.noreply.github.com> Date: Fri, 21 Feb 2025 17:44:54 +0100 Subject: [PATCH] messages --- .../api/giveStartingGearController.ts | 31 ------------ src/services/inboxService.ts | 4 +- static/fixed_responses/eventMessages.json | 12 +++++ static/fixed_responses/messages.json | 49 ------------------- 4 files changed, 14 insertions(+), 82 deletions(-) create mode 100644 static/fixed_responses/eventMessages.json delete mode 100644 static/fixed_responses/messages.json diff --git a/src/controllers/api/giveStartingGearController.ts b/src/controllers/api/giveStartingGearController.ts index c1ead7dd..ef9be78f 100644 --- a/src/controllers/api/giveStartingGearController.ts +++ b/src/controllers/api/giveStartingGearController.ts @@ -88,40 +88,9 @@ export const addStartingGear = async ( const inventoryDelta = await addItem(inventory, item); combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges); } - // currentloadoutids - - // "LoadOutPresets": { - // "NORMAL": [ - // { - // "s": { - // "ItemId": { "$oid": "67b73fbfb56b4b84d70433c2" }, - // "mod": 0, - // "cus": 0 - // }, - // "p": { - // "ItemId": { "$oid": "67b73fbfb56b4b84d70433c5" }, - // "mod": 0, - // "cus": 0 - // }, - // "l": { - // "ItemId": { "$oid": "67b73fbfb56b4b84d70433c4" }, - // "mod": 0, - // "cus": 0 - // }, - // "m": { - // "ItemId": { "$oid": "67b73fbfb56b4b84d70433c6" }, - // "mod": 0, - // "cus": 0 - // }, - // "ItemId": { "$oid": "67b73fbfb56b4b84d70433c7" } - // } - // ] - // }, inventory.PlayedParkourTutorial = true; inventory.ReceivedStartingGear = true; - //originally ship is returned - //also weaponskins return inventoryChanges; }; diff --git a/src/services/inboxService.ts b/src/services/inboxService.ts index 11768054..895699f1 100644 --- a/src/services/inboxService.ts +++ b/src/services/inboxService.ts @@ -2,7 +2,7 @@ import { IMessageDatabase, Inbox } from "@/src/models/inboxModel"; import { getAccountForRequest } from "@/src/services/loginService"; import { HydratedDocument } from "mongoose"; import { Request } from "express"; -import messages from "@/static/fixed_responses/messages.json"; +import eventMessages from "@/static/fixed_responses/eventMessages.json"; import { logger } from "@/src/utils/logger"; export const getAllMessagesSorted = async (accountId: string): Promise[]> => { @@ -32,7 +32,7 @@ export const createNewEventMessages = async (req: Request) => { const latestEventMessageDate = account.LatestEventMessageDate; //TODO: is baroo there? create these kind of messages too (periodical messages) - const newEventMessages = messages.Messages.filter(m => new Date(m.eventMessageDate) > latestEventMessageDate); + const newEventMessages = eventMessages.Messages.filter(m => new Date(m.eventMessageDate) > latestEventMessageDate); if (newEventMessages.length === 0) { logger.debug(`No new event messages. Latest event message date: ${latestEventMessageDate.toISOString()}`); diff --git a/static/fixed_responses/eventMessages.json b/static/fixed_responses/eventMessages.json new file mode 100644 index 00000000..6ecf6d44 --- /dev/null +++ b/static/fixed_responses/eventMessages.json @@ -0,0 +1,12 @@ +{ + "Messages": [ + { + "sub": "Welcome to Space Ninja Server", + "sndr": "/Lotus/Language/Bosses/Ordis", + "msg": "Enjoy your Space Ninja Experience", + "icon": "/Lotus/Interface/Icons/Npcs/Darvo.png", + "eventMessageDate": "2025-01-30T13:00:00.000Z", + "r": false + } + ] +} diff --git a/static/fixed_responses/messages.json b/static/fixed_responses/messages.json deleted file mode 100644 index a67069c7..00000000 --- a/static/fixed_responses/messages.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "Messages": [ - { - "sub": "Welcome to Space Ninja Server", - "sndr": "/Lotus/Language/Bosses/Ordis", - "msg": "Enjoy your Space Ninja Experience", - "icon": "/Lotus/Interface/Icons/Npcs/Darvo.png", - "eventMessageDate": "2025-01-30T13:00:00.000Z", - "r": false - }, - { - "sub": "/Lotus/Language/Inbox/DarvoWeaponCraftingMessageBTitle", - "sndr": "/Lotus/Language/Bosses/Darvo", - "msg": "/Lotus/Language/Inbox/DarvoWeaponCraftingMessageBDesc", - "icon": "/Lotus/Interface/Icons/Npcs/Darvo.png", - "countedAtt": [ - { - "ItemCount": 1, - "ItemType": "/Lotus/Types/Recipes/Weapons/BurstonRifleBlueprint" - }, - { - "ItemCount": 1, - "ItemType": "/Lotus/Types/Items/MiscItems/Morphic" - }, - { - "ItemCount": 400, - "ItemType": "/Lotus/Types/Items/MiscItems/PolymerBundle" - }, - { - "ItemCount": 150, - "ItemType": "/Lotus/Types/Items/MiscItems/AlloyPlate" - } - ], - "highPriority": true, - "eventMessageDate": "2023-10-01T17:00:00.000Z", - "r": false - }, - { - "sub": "/Lotus/Language/G1Quests/Beginner_Growth_Inbox_Title", - "sndr": "/Lotus/Language/Menu/Mailbox_WarframeSender", - "msg": "/Lotus/Language/G1Quests/Beginner_Growth_Inbox_Desc", - "icon": "/Lotus/Interface/Icons/Npcs/Lotus_d.png", - "transmission": "/Lotus/Sounds/Dialog/VorsPrize/DLisetPostAssassinate110Lotus", - "highPriority": true, - "eventMessageDate": "2023-09-01T17:00:00.000Z", - "r": false - } - ] -}