From af70a7f21bb0c0629f56d8590feddc3adde85580 Mon Sep 17 00:00:00 2001
From: MathMan05 <mathmanrm@gmail.com>
Date: Wed, 30 Apr 2025 19:10:07 -0500
Subject: [PATCH] channel is nullable fixes

---
 assets/openapi.json                         | Bin 642373 -> 642477 bytes
 assets/schemas.json                         | Bin 26419270 -> 26419350 bytes
 src/api/routes/guilds/#guild_id/channels.ts |  33 +++++++++++++-------
 src/util/schemas/ChannelReorderSchema.ts    |   2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index c3124e1e755a0966205e8c635dc6e5c8f78d374f..09be25e69c384e06469ba68fe0dda04dc18a206b 100644
GIT binary patch
delta 102
zcmX>)OMUHZ^@bM4ElkX-rspkYR+^rW!pJ&(!6Ihm>2lwgIHsRp#4J0#p_kcXdV@Wq
x(R7CnpppyeKqYT=nI)!Aa9}ZL|GbI`h?#+y1&CRJm<@>8ftX|a=T)3RN&pW4DvtmF

delta 80
zcmZ2GTm9%P^@bM4ElkX-reBa?^q<~f&uBC~;SjUh^!4jlBqtwm7MlE_pKrRs4Q7G%
d=+#U>%nZaVK+FonY(UHo#2nkBS91m_0RRklA6ozb

diff --git a/assets/schemas.json b/assets/schemas.json
index 44c77a771df04a52394616f988d1c0f5e8204b19..e95b0ba737ed348285d8c08dbbdf95a950c77c94 100755
GIT binary patch
delta 1742
zcmWmEReTm?07miOM~xT*Mh_Om=pHq4)Tq(jqnnLx81TY?0Rw~22E;B5>;Md`Sxm77
z#a0x%<D85Cxqoh+(<h5!51uND%?puGB9siJLg`Q@#Dub;TqqwZgxF9q#Dz+sa;OsG
zL)B0%R1Y;m%}^`U4hf-7s2dWGCtW-fJ)aYk5IuJxH6?m1J1sGqaWpwTdMPBu9m>m0
zk4(<bElxr*Qcw@|(EtsRibiORCTNOgXpR<WiB@QhHfW1>NJD#cKu2^!XQZPGx}qDp
zqX&8-1HI52eb5*Ekcs{nfPol<!N|f848<@E#|VtXD2&D!jKw&N#{^8oB)EMFreYeh
zF&#576SFWIb1)b4FdqxB5R0%FOOS(HEX6V`#|o^(Dy+sDti?L4#|CV~CTvC?wqPr^
zAz(XpARjxi3%gN(J=lwVD8zmoz-71`SKvw<L=;!yYFvYBaUHJ54LF3uID#8-6gS~!
z+=5$i8*axPxD$8bZrp=oxEJ@~emsEVcn}ZaVLXCI@faS*6L=C&;RH_N6rRR2coxs$
zG@i!`co8q*Wfb8Ryo%TGI^Mt;6yr_2g|m1Y@8Dg$hxhRTKEy{jhx7OtpWp&M#b@{&
zU*Jo8g|G1qzQsj+hwpI-Kj26FgrD&Xe#LM29e?0Y{Dr^q5B|k}1-ZqMLYNY!q$y=e
zn=&TGlr`l{c~il}nu;dQR5F!K6%%i&nrf!HsbOlGTBf#1Fm+5_lW3AmvPm)ZOnuY9
zG&HHEk!ft2n5L$gX>MAWmZp_yZQ7W&rkzPM?M(;M(R4DMO}gn~x|(jLyXj$inhev+
z^frA=U(?TIn*L^h8E6KX!6wTLF+<HTGu(_YBh4r?+Ke${%{VjOOfVD8Bs1AeF;mSn
zlWnG(8D^%LWoDZ>X0DlM=9>j(p;=@Wn<Xa4<eH^snOSaDn3ZOgS#8#swPu}JZ#I~X
tW|P@$^2`>q)oe4tY&SbhzS(JZncb$q>@j=IK2vD+n*)&(98%<L*8fEdZf*bo

delta 1727
zcmWmERd^P307miWgVAG*X2j_3W^|4k-QC^YFyKE13>X+pP|5%U6c9TY2BJ<yrl_D`
zfQ@2-f_2Wt@7%vP@6J<M(Wf)BqLV`;<On%KRLB)_hdd!~$QSa50wFpS3^Aclhz*59
zkx(=g3&lf;P%@MXaiMf56Uv5iC*rT2%Q$)_DlX%Ch>zKKHZdVGGBq<h9_3L16;TP5
zQ3X{|4b@QtHBk$-Q3rKV5B1Ri4bcdV(F9G=49(F3322E{XpJ^#i*{&_4(NzZ=!`B%
zL|1e}cl1C{B%v32qYwI`ANpee24WBfV+e*~7=~j6+&&7UF$QBX4&yNa6EO*sF$GgG
z4bw3LGcgOZF$Z%o5A(4A3$X}`u>?!849l?sE3pczu?ERli*;C!fD~*%DmG#hHX{vN
zuoc^oj_ufiJ8&oN!rj=34BUfV*o}K}ANF7`_F+E`;C?)S2k{UN;t(FjBX|^#;V_Qi
zaXf*eIELeR5-0E!p2jnH7SG{%ynq++5?;nhWa1QF!K-);uj4e{z!|)Wx9~Qy@DAR^
zdpL{taSqw|03YH!KElWN1Q&1-pW-uI!exApFYqP4!WCS_*Z2nC;yZkgAMhit;V1lz
z>-Yt~;y3(`KX3y#@hASmE!@W6_y_;uzqHKkNIFaolhZ_*Tqd{4WAd7OCci0QqD?^)
zV+xsAQ`i(SMNKhN+>|gSO(_#+N}DpKtSM*WO?gwnR5X=LWmCmeHPuXYQ^V9WwM=bO
z$J90TOnuY9G&GG&W7EVmHO)+O)50W}mZp_yZQ7W&rk!bTI+%{8lj&@_m_*anbTi#e
z57W~mnO>&1>0|nuex|<}U<R5&X0RDzhMHk!xEWzano(x78Dqwpab~=kU?!SLX0n-L
zrkZJHx|v~SnptMHnPcXfd1k&@U>2H1X0cgfmYQW|xmjUWnpI}CS!0sTTC>iqH^HQs
f4JOrWG@Hz3lV-M<t!A4^H`~pQ$Vm<<az5#Q)8*YX

diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts
index 179128eb..a38b9ae7 100644
--- a/src/api/routes/guilds/#guild_id/channels.ts
+++ b/src/api/routes/guilds/#guild_id/channels.ts
@@ -120,8 +120,9 @@ router.patch(
 			(x) => !body.find((c) => c.id == x),
 		);
 
-		const withParents = body.filter((x) => x.parent_id != undefined);
-		const withPositions = body.filter((x) => x.position != undefined);
+		const withParents = body.filter((x) => x.parent_id !== undefined);
+		console.log(body);
+		const withPositions = body.filter((x) => x.position !== undefined);
 
 		await Promise.all(
 			withPositions.map(async (opt) => {
@@ -148,22 +149,30 @@ router.patch(
 					Channel.findOneOrFail({
 						where: { id: opt.id },
 					}),
-					Channel.findOneOrFail({
-						where: { id: opt.parent_id as string },
-						select: { permission_overwrites: true, id: true },
-					}),
+					opt.parent_id
+						? Channel.findOneOrFail({
+								where: { id: opt.parent_id },
+								select: {
+									permission_overwrites: true,
+									id: true,
+								},
+							})
+						: null,
 				]);
 
-				if (opt.lock_permissions)
+				if (opt.lock_permissions && parent)
 					await Channel.update(
 						{ id: channel.id },
 						{ permission_overwrites: parent.permission_overwrites },
 					);
-
-				const parentPos = notMentioned.indexOf(parent.id);
-				notMentioned.splice(parentPos + 1, 0, channel.id);
-				channel.position = (parentPos + 1) as number;
-				channel.parent = parent;
+				if (parent) {
+					const parentPos = notMentioned.indexOf(parent.id);
+					notMentioned.splice(parentPos + 1, 0, channel.id);
+					channel.position = (parentPos + 1) as number;
+				}
+				channel.parent = parent || undefined;
+				channel.parent_id = null;
+				console.log(channel.parent);
 				await channel.save();
 
 				await emitEvent({
diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/util/schemas/ChannelReorderSchema.ts
index a026608a..657ed420 100644
--- a/src/util/schemas/ChannelReorderSchema.ts
+++ b/src/util/schemas/ChannelReorderSchema.ts
@@ -20,5 +20,5 @@ export type ChannelReorderSchema = {
 	id: string;
 	position?: number;
 	lock_permissions?: boolean;
-	parent_id?: string;
+	parent_id?: null | string;
 }[];