summary refs log tree commit diff
path: root/src/util
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-10-28 19:23:02 +1100
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-10-28 19:23:02 +1100
commit4c58a8bc249856a3e3b0af02ac086226a9308ddc (patch)
tree65ababbcb6915bf2e686d003383ce5ea573289df /src/util
parentlol (diff)
downloadserver-4c58a8bc249856a3e3b0af02ac086226a9308ddc.tar.xz
Fix user settings not saving properly and guild folders
Diffstat (limited to 'src/util')
-rw-r--r--src/util/entities/User.ts6
-rw-r--r--src/util/schemas/UserGuildSettingsSchema.ts2
-rw-r--r--src/util/schemas/index.ts3
3 files changed, 6 insertions, 5 deletions
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