From 00e3606f7c99eb3f9b4c6f9e0eb72234eb7d584a 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: [PATCH] Fix user settings not saving properly and guild folders

---
 assets/schemas.json                         | Bin 813547 -> 844214 bytes
 fosscord-server.code-workspace              |   3 ---
 src/api/routes/users/@me/settings.ts        |   9 +++++----
 src/util/entities/User.ts                   |   6 +++---
 src/util/schemas/UserGuildSettingsSchema.ts |   2 +-
 src/util/schemas/index.ts                   |   3 ++-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/assets/schemas.json b/assets/schemas.json
index 464eeb66e7226bb6183a3a738ddd771a6c5cd2ff..316d512b8b189eafa01befa2afe2ad5f82f2c161 100644
GIT binary patch
delta 5830
zcmc&&OKTHh6y=*&W+qb-u|BY9t<`Q+M6^(w_-L)I(2{1;NNa~Cnl`2+X-N||5)6nB
z)S{5;C%9-MNL~4$kSo<iAqb-Q!j0f2x`;+MO0^52#%ZH}z|GmtEY9KFbI-YaU*GP`
z<#*j*7~<Yx=D7aMrZ$~AJ`x#;H^-9EV}o&5C>f3f2g1Rz=CMRP919&aUE$!rpRqu6
z@b7n5ir4LCCjU0h{Jg%#Xvp}P#?ubw%}njs$VboUYxvdg;{HtfawB(s5IcB5X5HNJ
zQ0$rM3_Wc};-9$tr45NcJ-^}*5TB~{uz3%V0JjL(sQ&`Hha3a>Uoh4Il!0>9!UL!R
zk9&nO)QQe1p%obgG+h)FC;?%+_!H`ZuDF;7d4Q}oXar#|HIYf#Me!X}{g<uMO(X$s
zg`iCN^OAlTnS`5OOTUpaP;!;L03|TjCl4WmsA7b4R;~ptBuy6OaS-<MS;`MM4T;Wf
zQwq?dU^by>P#G)&RkUSRd5_wMft>CmUs-V@WuQ-OwvQ+UtZwpA?M2%aC;{n}Z8LNP
zscN+Zt))k%szSqH?QJ#KjV$IjKh(J+NCL$!O+k*J(u?gA+MQ023|1WW^SvcuC7A_{
zkPBI9$Y_HeRAx>OPaFgZvh;?;t$RtL@~G|y2}0Ibx}gV~b*}jMWS^jLW1V4U(py)z
zcmwf7I1q9F?~~p>&OXa^+;K~G^4=SohdbR&qLS07*XY-JBa2#r<%#=3tcEr$>Q9iq
dqox*n3E0X#bn=}28kB(lx&0E5fJe|%e*n({Vfp|7

delta 695
zcmXYtOK1~O6o#2QGdFkcMAHgZd||9fn=UFftx&{(t%(&2i4Pj>qL4)mnhJ*C1AO5=
zmIelUP?2cd*iCITdXa8Ivr(*A5v5|WLEKb93dJsb#mU^W`_6y=^Ph9>vr6apce|!m
zlQ1@>4?NkBdU3#^$E9y!DVcv7BMymBSXqfW2sXOJiE-tTG>O1xMd_2SLjh7mbxWGm
zuy^ls(kqiio~TqJ*r<zF{pvC{ELds<8_El6RjObk6EA(*Ji2DiXm=2=l{C*mId`(A
z{X_M2pS~Iv_CeD)a^$1#!`!Luv>VY#(XY<Zap8GNnWM(RMz@IkrJpdYC*lfWLw?lt
z1=YfPR}S&mR^~^;t&?mC*LhH641Z+yHye)0C67dn@^Oj534=-l*jJchc*Q96%cs^}
z{uUEAX89=!XH#qwOeQr3SF)UoOomMCuUiMjo_U@?>$KPWg&3`vRmU(OV%)uiiw+)j
z-$eA>c4sBRhtp<UG>w=S3<##oA*<tuAG~oAfW>yQ1Ln??HIS>Z5WE@HTb$Cmch?7V
zA=+B6+Q3^h4J&<dH<Y_n+uyCVK*we7g<L`L!}5&Q2I-Qz6B;flK}aWQvz6%4q1sNU
zmD#qrp30#!L7Qy38Lr1T9q&@tLse7OS%)94h5S#W0rq7G6*tbA_nrTV5`OhRrpFd%

diff --git a/fosscord-server.code-workspace b/fosscord-server.code-workspace
index bab8e15b..60d8a538 100644
--- a/fosscord-server.code-workspace
+++ b/fosscord-server.code-workspace
@@ -3,9 +3,6 @@
 		{
 			"path": "src"
 		},
-		{
-			"path": "src-slowcord"
-		},
 		{
 			"path": "assets"
 		},
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);
 	},
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 7f37391a..700a6dae 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -453,10 +453,10 @@ export interface UserSettings {
 	gif_auto_play: boolean;
 	// every top guild is displayed as a "folder"
 	guild_folders: {
-		color: number;
+		color?: number;
 		guild_ids: string[];
-		id: number;
-		name: string;
+		id?: number;
+		name?: string;
 	}[];
 	guild_positions: string[]; // guild ids ordered by position
 	inline_attachment_media: boolean;
diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/util/schemas/UserGuildSettingsSchema.ts
index 43028c58..e78bbf7c 100644
--- a/src/util/schemas/UserGuildSettingsSchema.ts
+++ b/src/util/schemas/UserGuildSettingsSchema.ts
@@ -3,7 +3,7 @@ import { UserGuildSettings, ChannelOverride } from "@fosscord/util";
 // This sucks. I would use a DeepPartial, my own or typeorms, but they both generate inncorect schema
 export interface UserGuildSettingsSchema
 	extends Partial<Omit<UserGuildSettings, "channel_overrides">> {
-	channel_overrides: {
+	channel_overrides?: {
 		[channel_id: string]: Partial<ChannelOverride>;
 	};
 }
\ No newline at end of file
diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts
index 8881b247..780022c6 100644
--- a/src/util/schemas/index.ts
+++ b/src/util/schemas/index.ts
@@ -44,4 +44,5 @@ export * from "./ChannelPermissionOverwriteSchema";
 export * from "./UserGuildSettingsSchema";
 export * from "./GatewayPayloadSchema";
 export * from "./RolePositionUpdateSchema";
-export * from "./ChannelReorderSchema";
\ No newline at end of file
+export * from "./ChannelReorderSchema";
+export * from "./UserSettingsSchema";
\ No newline at end of file