From 0d666732c61ce98fe775bc5c34ebbef11b839ec2 Mon Sep 17 00:00:00 2001
From: Puyodead1 <puyodead@proton.me>
Date: Sat, 25 Mar 2023 20:21:13 -0400
Subject: [PATCH] oapi: bug fixes

---
 assets/openapi.json                           | Bin 450358 -> 449141 bytes
 assets/schemas.json                           | Bin 16262850 -> 16240265 bytes
 scripts/schema.js                             |   2 +-
 src/gateway/opcodes/LazyRequest.ts            |   4 +++-
 src/util/interfaces/Activity.ts               |   2 +-
 src/util/schemas/AckBulkSchema.ts             |  12 +++++-------
 src/util/schemas/IdentifySchema.ts            |   6 +++++-
 src/util/schemas/LazyRequestSchema.ts         |   7 ++++++-
 src/util/schemas/MemberChangeProfileSchema.ts |   8 ++++----
 src/util/schemas/UserProfileModifySchema.ts   |   8 ++++----
 10 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index a45cafa2f0f811bcfb84cb68cef385afe2f7a361..27a2f9730221cb749130e0a8f9fc96e5db62e8c9 100644
GIT binary patch
delta 293
zcmdnCPx|W?=?y(B(-nR))lT1F!_+bT!3idg$>&+MCx2+voPMF3k#q6_R;B5>!Av}p
z)7W&UFUV%roBlzNMGi!;PH))HxDBFZAG<0<)n|64=?kVZ8BTUcb)Vj+%E+^slQYa}
zdP6yr{^SL0n$ruoSS+VaWHO(;z+JbQ$+exym2o?hD-$c%^a+cZjVG^~EImD;n=xYg
zdw(W{=^J)2=}lLVW@OvGK7gr45XF?VNn5zLYo;)r;y~32v_*0HgoiAe(*;&D$xi>^
k2h_bakEu2TpR&mh`dQjP-CzP@W*`Q!S+{?>!REpS04&^ae*gdg

delta 564
zcmeymMS9yl=?y(B(+gHJdrtesq&Yp{3!}>P1%Au|(+%_(IVKCR>P$Zn#K<~Xz{g;^
zgE*5kSZ;DdImh()awd)G3$`<JqRLJGAHc*jS%pm(tZ#b38YZ*p4Of_DA-X4gXX2f{
zp&BR#(m8#@Rwk&r06j)UxY?8A+10?>rv)-`PoBuGG<kv@%XEVzX8Fki9+J~1oMe)j
zJ|Pn*6{IdbeZx~mmg#HPFmp^k+#){tK(aef6W3-_jtDD|ujD2Ngm6qZP-BsTm|pNp
z4Z?8nkpr6wGz{n|kYk`G%0nFf{t6>E&_uE63ltgUAdUwG#H2{C=4R*iW@pCj&CX0L
zT+=sLF&ct{Z!*7<$n*)K%=%E<Kp|5g$^jD=L~*+D^xsz)b*C?oWMtdk=*Lteh|jIl
zUNb2}LV!qb0KEwE5YP+2Foimwb&|R6<c3Y$+m9tMo#FsHdpj_EVi<uzCbYdFi)ldy
Ynqa%Y6(%5N24WT<X5B7ug)Nm00Q_;o1ONa4

diff --git a/assets/schemas.json b/assets/schemas.json
index 098fbaa2055e0941ca82cfad00094a015061a9de..3bce63f857ceee9f55d502145964300bb025e68a 100644
GIT binary patch
delta 6219
zcmcIoT~L%&7#@Ci*#$vX7GXmc<VSuCf~g2Xscf7CWQkC;2y#ae7-C^TZ~%c2$q0c~
z_N?*aMn?Qa1koW228kiZ!P=-bL<V*o2?kJ*$P4MB1Dlu4Jl{nZ-`(>(=XuZjp7%TN
z8NO-Yoo}4s)ie`Dh^d%#M_%?Kf$JAMh^(yLpVS0NY)Hv>mtIuAeb!H{&hsJCJF!m@
z*<^=6<!9<e6a_phRr1SjB)K>AX%e9k1d)<Mw(c8bJEB;WNQhxin2;!xwqi2$x}$}W
znQtahb*I~_0{ylSU4F)4GA**P?tRx>zmFszlLipkwd+2l#`}OXQOq}qiQQ#e{>Hi?
z6*}i_ROjrFrYDIKa~`SMZYiSSQqu?zlt&q_3`Y-%Ek}34+9$U1tG!V)5eTgXbjDT?
ziQ8cmg4-#z*m4a<_qp3u<3?)Nx1NEe>GEHqbP&Dv7~8*0J#AZZYz0*r`nfqLTVGh)
zcV43M!q91Y+BoZyAS4Fsr5$9jl5ayoPfm-7&L=@imjC9vs+Thbr0b!J<7T-lRvpAN
zeAT7Y50-CQbB*<c(Lb-aoiicYi8qo|(s+CJ*-+h|ZX<YZbC!30iKERHJq;%R8T*s|
z;Pm9Ehg0p6#Kj$sCU(wS2Ad(;DL)>4|E^C6SQjjJjM5zl+X=k4I|WDQEe4=<&zua;
zJ`)9pN*@@4i}5I<?>wu-(OUiU9I9XR>kA*@+T}OHvT*dRAH$dNJ^Ad1z4vkL?7^2b
zyWz|)48M|!YX=X!$^l(S_dDU*xnI53g`>?nBQ@|264?oZIW7J?+8JKJNGbXxCVv;Y
zmqyBMZEPFdVmB#drQkPnn${Gzjib9`ns{&1|E)(E!&$$0crpOp0oqr8!~+h3ep~lu
zHhiz3!i$Nu`0t{yCh0zS3exrTK;1imxbLIY@&z32@xgIV9PM*9B_Bo;DqFCj7tW;S
z!4x{1pI(8Zqm&tY;R8U^vome*L&>!HG&v*7nuDDb<tg|lOQKSgLi$B=ZU#q+#nHUu
z94YZ}r|V$~)kPI(;Gj200vfZwr~zKUNEweP{+J^rF0`}>r^E!5^Xcv2GBuoY$|#-S
z0_<2$?W(8;dnrRFc%4T(C__g}E9bz<W@ra#6?!dUm-5rj)k~mng`P%kuWbbPBv(&H
zWD8N$)m}9OQkb0)VO^;|*25Xv*Os7V!_aN~OK4qgXq(n^KzFP+@W9ey+T>9a`g><+
z^@^4Qx^AKQF?e8^cFyb-4%*6@77d=um5EmLgfb_}@pdh&O+Fm$vZ5wqoh^8%jN*!;
zYlgZzU^`TLwdXy!YzaeK(yD>4IXpY`_kVK)tS>glJnZdn2PbWYF6g`3iQiUuJ>M7N
zXnEIQG1y)<=C6*Sleo5^b=V6`DATrU9%%s+%Fyci(FWX!z2^EX*r1vA@8m`+?j)&p
ztO|~jFti2zrSc~+N6J{aZW*S~`jYW1xEhU@b2d0k!wVQGJ*RHruOP<pq$Fd~iXP0K
zILOf*<E7#0zL7eWiYHJcpH2jO11k<T{<Xkp<33HM-bMd{?A3O2zD$tc`xK7ANSS%-
zk1H^R$`8%w!0D!JHsJ7n;S;&UVf(Z9J;=tLjO<z2fun~*R?%zRzwhOAAZQK!DY9w^
P^MBL{+L7x`1x5b=U7|P1

delta 13652
zcmc(l`%jZ+6vtC~FBGT<NSl`81w=*E4R6SR;B^y$Im3(^aiXrESm>M*HRa-9nu$oA
zrvt{YUIyy0a~o${*kpz<XB;B43=y<~!yAapG$@P99$L5k1<%<JO`7J-`|0;Q-}jv7
zJ?Gi`@lEOZpPkZD8?>sObD;Xpg(T1~Tr?G`=lqrkjbYJYkf)ui0=*@DKHT)$qp;|N
z63dW45BkgLN=RPb)&SKn>q17Zl0)9}r7ym{xKvXn5JBmbu@k|#O*|UT?Ui^!Z{w^$
zi@jVXm=5{(OEy88%t!u3gU~S_s#~NwDAj6YW#wbRzU|~xDD96?g7JvW-~BD|dbrL_
z`sYr5FD`i|6v5hx4o`UFJ&yp_J)pHys0O`i-0Wg|Z3^0JU(awrQjkar-Pa=huv_O5
zH=aKc8L^OpBN{Df9>-q~eCMf<Ld-i;<mlxsGl%gfA|tLKh~S7a1um0#?I#H1S4!_6
z2r%`-J_iUwcX-%GjLnZ#xdf6h`=MVZ0SDshtHtn2SD6HZ?)sZ2@He`Ph?jc<YpCR5
zU3ZYrBqC+NU=kee*6a`EPsDFJwQqWYQ8ZBxk1AMYa#c6z(~e>6P)%968q%!06kzSs
z29Eq9wlpqR{ad4Skd~e(Vl^tjvP|r2DQTDBFMZnl$prtq=x%Tdf!9!eJETZ}tl+K|
zFzKV%M+tE^BYeU8s4RFSHac+L()hxSJ0TJ@_Jyn?NFyk`HSP=r=l1mpPQicXKxPgv
z0meS?UpbawiJ!NJB@?KGM;9kcvFJ+pY=U%x3}&CkKX`6Y*RDjQ5x_9BBa))jpsa2B
zQUXU{(WRHn6lR#!9A%>5be)@Jp(rLt8s?Ny=-E&oolU`!*<%JN{1$#Hc7Q_9;^Xnw
z2!iDEnQeg#)wK!hC`2)sfr7KRa#0Wk$MWHlItq^Iz-w0S=FW0p{JumrcRg7S*e8ru
zVpU;M=0x5OXQE;YQfj$p)S{;ZN;dCU5$5s#?D1F}TTQ8*k-SxAIIt^s<#_HUWSkkM
zRXG&Bo_6D!gA}hnA8lScKv6Lc^nW13M&r70ibc|7tiMmdfs!?wWEh*iK}!Hb2HQcv
zfw<@Ql(-<(u$=&g50f*CDL9|Lx+Ru-*<k5m%#y82?lqTjQWLUA6U5D8mV08&JX0n?
zJHW+Cj@q_`fQ5q*+l>Sqm!`_l+zJ8~8iIFP2|VE%9pT)d-IWBQ+%TU}W;O?-8H!<#
zBEO0NhG&I^RTQbB;IBQWDfFZb6;*QIF|)}f<47^;@%!EsUT51D3GN)&*F#Y}7%Y!M
z)W|>w7xtC(Q!JMYX6P-Yc&6NgBQ~lUMHa?l$D#Zw1gXgt#@LR-Bze#U^Sxpv$?z^%
z?@#4qFz{><cw^J~%4b9_k>HbtDw5U`i)Ap8C@~&BV;d%e{aAa9f0Kz-7nd8y96ezr
zD4A~9or)T=+z4!_F2klnC&}c&pTCObSh@f72`a0&i3P=V0aQf1oM%5p=9kZN&lZqX
zoQz#xrci8B2i~n;Nx%Wdkzro;*EWj79xmAGoNtd&H1cL-HSD6`I1S&M3HFV6aAV`!
z6nZAVbv~3JQDEV!rV}JNBI%+G9zK=&Lu>BYoly5os<z~bBOr2S+X6JNXx>5bn8hVs
z6ywz73r>pHCI+h^h%BlXU!ph>iPz#=G!%{ujc$F+os;Rn#HcnSchluKa47O>CwDzr
z4smkM){O?R&ok-E^eRi5NDGmn9ZSGzk5NJEInx9vovR7NN0Zw5A46sXw*K)QsobN>
zrmu`6hvR2#OR*)m)1M+U`)j%k6wkHY@5UPL8!EO^2?0(U1xFLq!@o<w^gK}AKFWQ4
z7^g|mcZ@rSz52PPc{btQ&D@g+8{n`h8^uW~m^n?P!Qi0>%LpQfp9~J<Py{dG-k^?x
gW9j*wV#?+oayYO5LD2_5`_(6>xd(5(!$YzAZ<y!6;s5{u

diff --git a/scripts/schema.js b/scripts/schema.js
index bb3e9ddc..ef43d80c 100644
--- a/scripts/schema.js
+++ b/scripts/schema.js
@@ -135,7 +135,7 @@ function main() {
 		definitions = { ...definitions, [name]: { ...part } };
 	}
 
-	modify(definitions);
+	// modify(definitions);
 
 	fs.writeFileSync(schemaPath, JSON.stringify(definitions, null, 4));
 }
diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts
index 64e50d92..cde91a75 100644
--- a/src/gateway/opcodes/LazyRequest.ts
+++ b/src/gateway/opcodes/LazyRequest.ts
@@ -267,7 +267,9 @@ export async function onLazyRequest(this: WebSocket, { d }: Payload) {
 	if (!Array.isArray(ranges)) throw new Error("Not a valid Array");
 
 	const member_count = await Member.count({ where: { guild_id } });
-	const ops = await Promise.all(ranges.map((x) => getMembers(guild_id, x)));
+	const ops = await Promise.all(
+		ranges.map((x) => getMembers(guild_id, x as [number, number])),
+	);
 
 	// TODO: unsubscribe member_events that are not in op.members
 
diff --git a/src/util/interfaces/Activity.ts b/src/util/interfaces/Activity.ts
index 7654ba90..0227f242 100644
--- a/src/util/interfaces/Activity.ts
+++ b/src/util/interfaces/Activity.ts
@@ -36,7 +36,7 @@ export interface Activity {
 	};
 	party?: {
 		id?: string;
-		size?: [number]; // used to show the party's current and maximum size // TODO: array length 2
+		size?: number[]; // used to show the party's current and maximum size // TODO: array length 2
 	};
 	assets?: {
 		large_image?: string; // the id for a large asset of the activity, usually a snowflake
diff --git a/src/util/schemas/AckBulkSchema.ts b/src/util/schemas/AckBulkSchema.ts
index cf6dc597..5604c2fc 100644
--- a/src/util/schemas/AckBulkSchema.ts
+++ b/src/util/schemas/AckBulkSchema.ts
@@ -17,11 +17,9 @@
 */
 
 export interface AckBulkSchema {
-	read_states: [
-		{
-			channel_id: string;
-			message_id: string;
-			read_state_type: number; // WHat is this?
-		},
-	];
+	read_states: {
+		channel_id: string;
+		message_id: string;
+		read_state_type: number; // WHat is this?
+	}[];
 }
diff --git a/src/util/schemas/IdentifySchema.ts b/src/util/schemas/IdentifySchema.ts
index fb48c2a4..cb967aed 100644
--- a/src/util/schemas/IdentifySchema.ts
+++ b/src/util/schemas/IdentifySchema.ts
@@ -109,7 +109,11 @@ export interface IdentifySchema {
 	compress?: boolean;
 	large_threshold?: number;
 	largeThreshold?: number;
-	shard?: [bigint, bigint];
+	/**
+	 * @minItems 2
+	 * @maxItems 2
+	 */
+	shard?: bigint[]; // puyo: changed from [bigint, bigint] because it breaks openapi
 	guild_subscriptions?: boolean;
 	capabilities?: number;
 	client_state?: {
diff --git a/src/util/schemas/LazyRequestSchema.ts b/src/util/schemas/LazyRequestSchema.ts
index f69ae1f7..ee52d66c 100644
--- a/src/util/schemas/LazyRequestSchema.ts
+++ b/src/util/schemas/LazyRequestSchema.ts
@@ -19,7 +19,12 @@
 export interface LazyRequestSchema {
 	guild_id: string;
 	channels?: {
-		[key: string]: [number, number][];
+		/**
+		 * @items.type integer
+		 * @minItems 2
+		 * @maxItems 2
+		 */
+		[key: string]: number[][]; // puyo: changed from [number, number] because it breaks openapi
 	};
 	activities?: boolean;
 	threads?: boolean;
diff --git a/src/util/schemas/MemberChangeProfileSchema.ts b/src/util/schemas/MemberChangeProfileSchema.ts
index e955a0f1..06505ab9 100644
--- a/src/util/schemas/MemberChangeProfileSchema.ts
+++ b/src/util/schemas/MemberChangeProfileSchema.ts
@@ -21,9 +21,9 @@ export interface MemberChangeProfileSchema {
 	nick?: string;
 	bio?: string;
 	pronouns?: string;
-
-	/*
-	 * @items.type integer
+	/**
+	 * @minItems 2
+	 * @maxItems 2
 	 */
-	theme_colors?: [number, number];
+	theme_colors?: number[]; // puyo: changed from [number, number] because it breaks openapi
 }
diff --git a/src/util/schemas/UserProfileModifySchema.ts b/src/util/schemas/UserProfileModifySchema.ts
index d49fe326..6f6777dd 100644
--- a/src/util/schemas/UserProfileModifySchema.ts
+++ b/src/util/schemas/UserProfileModifySchema.ts
@@ -21,9 +21,9 @@ export interface UserProfileModifySchema {
 	accent_color?: number | null;
 	banner?: string | null;
 	pronouns?: string;
-
-	/*
-	 * @items.type integer
+	/**
+	 * @minItems 2
+	 * @maxItems 2
 	 */
-	theme_colors?: [number, number];
+	theme_colors?: number[]; // puyo: changed from [number, number] because it breaks openapi
 }