OpenWF/SpaceNinjaServer
12
6
Fork 14
Code Issues 43 Pull Requests 1 Actions Packages Projects Releases Activity

fix: Unable to save settings when accepting trade policy. #966

Merged
OrdisPrime merged 5 commits from :main into main 2025-02-19 14:09:02 -08:00
Conversation 1 Commits 5 Files Changed 2 +24
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6c6403f460 - Show all commits

22
src/controllers/api/saveSettingsController.ts Normal file
View File

@ -0,0 +1,22 @@
import { getAccountIdForRequest } from "@/src/services/loginService";
import { getJSONfromString } from "@/src/helpers/stringHelpers";
import { getInventory } from "@/src/services/inventoryService";
import { RequestHandler } from "express";
import { ISettings } from "../../types/inventoryTypes/inventoryTypes";
interface ISaveSettingsRequest {
Settings: ISettings;
}
const saveSettingsController: RequestHandler = async (req, res): Promise<void> => {
const accountId = await getAccountIdForRequest(req);
const trainingResults = getJSONfromString<ISaveSettingsRequest>(String(req.body));
const inventory = await getInventory(accountId);
inventory.Settings = trainingResults.Settings;
OrdisPrime commented 2025-02-19 11:56:03 -08:00
Outdated
Review
Copy Link

training results?

training results?
CyberVenom commented 2025-02-19 12:03:58 -08:00
Outdated
Review
Copy Link

The client wil send the full settings object like so
{"Settings":{"GiftMode":"GIFT_MODE_ALL","FriendInvRestriction":"GIFT_MODE_ALL","GuildInvRestriction":"GIFT_MODE_ALL","ShowFriendInvNotifications":true,"TradingRulesConfirmed":true,"SubscribedToSurveys":true}}

The client wil send the full settings object like so {"Settings":{"GiftMode":"GIFT_MODE_ALL","FriendInvRestriction":"GIFT_MODE_ALL","GuildInvRestriction":"GIFT_MODE_ALL","ShowFriendInvNotifications":true,"TradingRulesConfirmed":true,"SubscribedToSurveys":true}}
OrdisPrime commented 2025-02-19 12:49:57 -08:00
Outdated
Review
Copy Link

yea that all makes sense, I was just wondering why its called training results :D

yea that all makes sense, I was just wondering why its called training results :D
OrdisPrime commented 2025-02-19 12:51:52 -08:00
Outdated
Review
Copy Link

Also I was wondering if you know whether these settings are meant to be overwritten in full or whether this situation can exist:
inventory.Settings: { setting1: "something"}
server sends: Settings: { setting2: "something2", setting3: "something3"}

because in that case the old settings would get lost. Just wanna make sure we checked for that

Also I was wondering if you know whether these settings are meant to be overwritten in full or whether this situation can exist: inventory.Settings: { setting1: "something"} server sends: Settings: { setting2: "something2", setting3: "something3"} because in that case the old settings would get lost. Just wanna make sure we checked for that
CyberVenom commented 2025-02-19 13:06:23 -08:00
Outdated
Review
Copy Link

I just forgot to edit the name when i copyt the file.

I was thinking that too but i havet found anything eles to trigger that endpoint

I just forgot to edit the name when i copyt the file. I was thinking that too but i havet found anything eles to trigger that endpoint
OrdisPrime commented 2025-02-19 13:28:27 -08:00
Outdated
Review
Copy Link

I just forgot to edit the name when i copyt the file.

I was thinking that too but i havet found anything eles to trigger that endpoint

Okey, right.
You could just use Object.Assign(old, new). This way old settings will be overwritten and new added.

> I just forgot to edit the name when i copyt the file. > > > I was thinking that too but i havet found anything eles to trigger that endpoint Okey, right. You could just use Object.Assign(old, new). This way old settings will be overwritten and new added.
CyberVenom commented 2025-02-19 14:05:53 -08:00
Outdated
Review
Copy Link

It wil use Object.Assign now :)

It wil use Object.Assign now :)
await inventory.save();
res.json(inventory.Settings);
};
export { saveSettingsController };

2
src/routes/api.ts
View File

@ -86,6 +86,7 @@ import { updateQuestController } from "@/src/controllers/api/updateQuestControll
import { updateSessionGetController, updateSessionPostController } from "@/src/controllers/api/updateSessionController"; import { updateSessionGetController, updateSessionPostController } from "@/src/controllers/api/updateSessionController";
import { updateThemeController } from "../controllers/api/updateThemeController"; import { updateThemeController } from "../controllers/api/updateThemeController";
import { upgradesController } from "@/src/controllers/api/upgradesController"; import { upgradesController } from "@/src/controllers/api/upgradesController";
import { saveSettingsController } from "../controllers/api/saveSettingsController";
const apiRouter = express.Router(); const apiRouter = express.Router();
@ -182,5 +183,6 @@ apiRouter.post("/updateQuest.php", updateQuestController);
apiRouter.post("/updateSession.php", updateSessionPostController); apiRouter.post("/updateSession.php", updateSessionPostController);
apiRouter.post("/updateTheme.php", updateThemeController); apiRouter.post("/updateTheme.php", updateThemeController);
apiRouter.post("/upgrades.php", upgradesController); apiRouter.post("/upgrades.php", upgradesController);
apiRouter.post("/saveSettings.php", saveSettingsController);
export { apiRouter }; export { apiRouter };