From 4c6b1e8e16a1f44dc7c5f9abd74c0615d0e4e51c Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:24:51 +1000
Subject: [PATCH] Fix UserRelationsResponse schema

---
 assets/openapi.json                           | Bin 564162 -> 564151 bytes
 assets/schemas.json                           | Bin 17945843 -> 17945785 bytes
 src/api/routes/users/#id/relationships.ts     |   5 ++--
 src/util/schemas/UserRelationsResponse.ts     |  27 ------------------
 .../responses/UserRelationsResponse.ts        |  16 +++++------
 5 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 src/util/schemas/UserRelationsResponse.ts

diff --git a/assets/openapi.json b/assets/openapi.json
index 64dc53c0591a45318b1ea94986bd1fc84d8d983a..2dc7874167f884022f583ac3deecd7cca58463a9 100644
GIT binary patch
delta 190
zcmX@KU1|GvrG^&97N#xCIzJ~Xv`9>k-^Hvj`GUUD^bMShO4A!88CfR>SgTL}u#Hgx
z%$qI{$mTNLz=c_Jy2CnFx9JUBOqxg%{+Z0`APLv$7j81MPoLn%tTuVVd%@`iO-z#0
z9eSAbCSUMTot}S@Q59l#f{Y|YH(2?Dt;{kIu7U@%+~fnLLemu(ndRDf|1twH3lOsc
NG23?DzwBG*0RWd9LH+;$

delta 124
zcmdnKUFpzvrG^&97N#xCIzJ~rkg;RUPs&P7o_sJteX@g>-*kgjOzP7ET$z2R8@Mo6
zP4~}a)`oBooMF_Oe&8dM;PeamOfJ(e++=2-KEaK7)#UrpVv`j%xwC=IDVaPm$Dp0*
UFEbFc05K~Nvu$Vk%f59U0Q8J8bN~PV

diff --git a/assets/schemas.json b/assets/schemas.json
index 2c2abe8f00b499b21aa8310e7240d962e7899c1f..dc25cacd30a1452f3cea3414caf6dfbad404bf82 100644
GIT binary patch
delta 770
zcmYMnXH?B$0D$q+zKvVmbQ3C-3K@~?mCTGpL$WfnWv9d~57AIudCAHyM2LiBL}X=T
zCcDf+_Ob5&L&t~bcg|CtQ7FsRq(TdAbkIc)eGHIch!Mt^AjcFl%u!%LEi6%DMQyC9
zLtW}&gDrN{#~ue9X@C>XxX_SBG{%)CG^H8Maiaw-ai<j?w5APhX-9iH(2-7brVCy1
zq#Iszrw2XhMQ{4xO<(%ap8@zV5MKr{7(e_8Adn#hF_d72F`N;MWE3HcW(;E)$9N_X
z%0wnHnJG+V8q=9U7&Dp0Z00bRdCVuA1w;_ZLZVp2VpK#E!xCUA%ZOz;D~KbW1QJ<E
z63MJ$HEPz7!de9DSWhY&*vKX}vxPLavW@NRU?;oSO*$FuVK4j0WIqSU;vk1OOg2Y2
zN)E@!<v1reNgk)j=QL+H%Q*@-&jkv($R&!n%oVP3jq4P1gPYvqHYMEQF88?410GV!
zBg%Np6Q1&n=e*!0<y7#B*Sz5^?|4roReazhpQz?DU--&5zVjpdXQaE@*VJ5i8kbs&
zO1ZA9$SaWBscr4;g=d1yMid7|IjECeEk%f%fy4g`OYw54Ii*llE9`2{Ql$BLJBzHM
z07s$9lbed-pmc>gKiWoAmBcxS<d{$^Q9skeUikWC=?PT_rG-e0R~W^nmX>R($Vn}I
z749Td{$a9MW$-Uezcu~Q^fz7^td*omLR&&dLRUghLSMo_LMCA-VI*NJVIm=yFqJTq
OFxSdg1}n76BK`p=PhDmJ

delta 706
zcmWm5XI#v20D$q&)m7InAuA3UsYv!HTV-8HoY9?<2;Cv8jLMS`O5txSJ9|X3va>hg
zlw@xwSs&|uFP`taCqJi9QEn;$8D^Lx#{x^NP+*M>w%B2h1CBW1OeI{XOcko)N;Rre
zgPPRBjoQ>fNnPquA9otikVZ7dgC=<5g*Q!Uh7Zm0r3Ec%MQhs7mUgtK10C_hpH6h9
z3tj0(cY4s100If37rp62U;3dUnEni4AR!DQl)(%^%}|ChoDqbfLCZ+OiC`3wj3$aP
zj3t_JjAsHd=+HBfNlYe|DNJP=)0sgW@yuivvzbEzi6k)>NM;@>%x3`$No5g>Swb4=
zEG2_Xma&`_NUUTPt69TZ*0G)qWRcBAHnEv4Y-JnU$zcaO*~M=5u$O)8=Ku%E<q(I-
z;|Td2<rv2~!AS}@#c9rPmUEov0)<@U5|_EcRjzTJ8{Fg;x4FYz?s1<Y9`KMy7<f!E
zB|M>&r<C!G=e*!0uXxQH-tvz3eBdLW_>7S+l=GDezVV$O{LK9o@0+1?&eY1?<ht<a
zNGV(A=PIRF6bDLr53NQjEs}*v$}&%_<fC$ll7hXwt)wh}Wss!Q#i%4rvNF_CY!R_3
zMs0wpz&xWiD9K$)2+=E24C>#e{+Rk}>R+lsElV>cFcX*y<N^zUrNBy{5LgRr1hxV@
TfxW;%;3#mC6&TdcvXZ#}<DyaB

diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts
index 7accad3b..3737ca00 100644
--- a/src/api/routes/users/#id/relationships.ts
+++ b/src/api/routes/users/#id/relationships.ts
@@ -17,7 +17,7 @@
 */
 
 import { route } from "@spacebar/api";
-import { User } from "@spacebar/util";
+import { User, UserRelationsResponse } from "@spacebar/util";
 import { Request, Response, Router } from "express";
 
 const router: Router = Router();
@@ -33,7 +33,8 @@ router.get(
 		},
 	}),
 	async (req: Request, res: Response) => {
-		const mutual_relations: object[] = [];
+		const mutual_relations: UserRelationsResponse = [];
+
 		const requested_relations = await User.findOneOrFail({
 			where: { id: req.params.id },
 			relations: ["relationships"],
diff --git a/src/util/schemas/UserRelationsResponse.ts b/src/util/schemas/UserRelationsResponse.ts
deleted file mode 100644
index 38507420..00000000
--- a/src/util/schemas/UserRelationsResponse.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
-	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published
-	by the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-	
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export interface UserRelationsResponse {
-	object: {
-		id?: string;
-		username?: string;
-		avatar?: string;
-		discriminator?: string;
-		public_flags?: number;
-	};
-}
diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/util/schemas/responses/UserRelationsResponse.ts
index 1ec15eca..e784cafb 100644
--- a/src/util/schemas/responses/UserRelationsResponse.ts
+++ b/src/util/schemas/responses/UserRelationsResponse.ts
@@ -1,9 +1,7 @@
-export interface UserRelationsResponse {
-	object: {
-		id?: string;
-		username?: string;
-		avatar?: string;
-		discriminator?: string;
-		public_flags?: number;
-	};
-}
+import { User } from "@spacebar/util";
+
+export type UserRelationsResponse = (Pick<User, "id"> &
+	Pick<User, "username"> &
+	Pick<User, "discriminator"> &
+	Pick<User, "avatar"> &
+	Pick<User, "public_flags">)[];