Merge branch 'master' of https://github.com/fosscord/fosscord-server

1 files changed, 3 insertions, 2 deletions

diff --git a/api/src/routes/users/@me/settings.ts b/api/src/routes/users/@me/settings.ts

index 4e014126..b22b72fb 100644
--- a/api/src/routes/users/@me/settings.ts
+++ b/api/src/routes/users/@me/settings.ts
@@ -10,8 +10,9 @@ router.patch("/", route({ body: "UserSettingsSchema" }), async (req: Request, re
 	const body = req.body as UserSettings;
 	if (body.locale === "en") body.locale = "en-US"; // fix discord client crash on unkown locale
 
-	// only users can update user settings
-	await User.update({ id: req.user_id, bot: false }, { settings: body });
+	const user = await User.findOneOrFail({ id: req.user_id, bot: false });
+	user.settings = { ...user.settings, ...body };
+	await user.save();
 
 	res.sendStatus(204);
 });