Compare commits

...

5 Commits
main ... main

Author SHA1 Message Date
Kenya-DK
b72d334eab Merge remote-tracking branch 'origin/main'
All checks were successful
Build / build (20) (pull_request) Successful in 34s
Build / build (18) (pull_request) Successful in 59s
Build / build (22) (pull_request) Successful in 1m10s
2025-02-19 23:04:27 +01:00
Kenya-DK
9accf7a597 fix: use Object.Assign when updating 2025-02-19 23:04:21 +01:00
c9eae22312 merge upstream
All checks were successful
Build / build (18) (pull_request) Successful in 37s
Build / build (20) (pull_request) Successful in 1m3s
Build / build (22) (pull_request) Successful in 57s
2025-02-19 13:11:42 -08:00
Kenya-DK
2d97dee80c fix: better naming
All checks were successful
Build / build (20) (pull_request) Successful in 35s
Build / build (18) (pull_request) Successful in 1m3s
Build / build (22) (pull_request) Successful in 57s
2025-02-19 22:11:17 +01:00
Kenya-DK
6c6403f460 fix: Unable to save settings when accepting trade policy.
All checks were successful
Build / build (22) (pull_request) Successful in 56s
Build / build (20) (pull_request) Successful in 1m13s
Build / build (18) (pull_request) Successful in 36s
2025-02-19 20:29:50 +01:00
2 changed files with 24 additions and 0 deletions

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 settingResults = getJSONfromString<ISaveSettingsRequest>(String(req.body));
const inventory = await getInventory(accountId);
inventory.Settings = Object.assign(inventory.Settings, settingResults.Settings);
await inventory.save();
res.json(inventory.Settings);
};
export { saveSettingsController };

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 };