From 4c58a8bc249856a3e3b0af02ac086226a9308ddc Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Fri, 28 Oct 2022 19:23:02 +1100
Subject: Fix user settings not saving properly and guild folders

---
 src/api/routes/users/@me/settings.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/api')

diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts
index 4493fcc7..8fb86012 100644
--- a/src/api/routes/users/@me/settings.ts
+++ b/src/api/routes/users/@me/settings.ts
@@ -1,5 +1,5 @@
 import { Router, Response, Request } from "express";
-import { User, UserSettings } from "@fosscord/util";
+import { OrmUtils, User, UserSettingsSchema } from "@fosscord/util";
 import { route } from "@fosscord/api";
 
 const router = Router();
@@ -16,14 +16,15 @@ router.patch(
 	"/",
 	route({ body: "UserSettingsSchema" }),
 	async (req: Request, res: Response) => {
-		const body = req.body as UserSettings;
+		const body = req.body as UserSettingsSchema;
 		if (body.locale === "en") body.locale = "en-US"; // fix discord client crash on unkown locale
 
 		const user = await User.findOneOrFail({
 			where: { id: req.user_id, bot: false },
+			select: ["settings"]
 		});
-		user.settings = { ...user.settings, ...body };
-		await user.save();
+		user.settings = OrmUtils.mergeDeep(user.settings, body);
+		User.update({ id: user.id }, { settings: user.settings });
 
 		res.json(user.settings);
 	},
-- 
cgit 1.5.1