From 777e7208dccb3e28f6c2fe85abb5a6d7aaa99ed2 Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Thu, 23 Mar 2023 13:51:29 -0400 Subject: [PATCH] AAA --- assets/schemas.json | Bin 8216740 -> 8837762 bytes src/api/routes/gateway/bot.ts | 11 --------- src/api/routes/gateway/index.ts | 4 ---- src/api/routes/users/#id/profile.ts | 22 +++++++++--------- src/api/routes/users/#id/relationships.ts | 6 ++--- .../schemas/responses/GatewayBotResponse.ts | 10 ++++++++ src/util/schemas/responses/GatewayResponse.ts | 3 +++ .../schemas/responses/UserProfileResponse.ts | 8 +++++++ .../responses/UserRelationsResponse.ts | 9 +++++++ src/util/schemas/responses/index.ts | 4 ++++ 10 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 src/util/schemas/responses/GatewayBotResponse.ts create mode 100644 src/util/schemas/responses/GatewayResponse.ts create mode 100644 src/util/schemas/responses/UserProfileResponse.ts create mode 100644 src/util/schemas/responses/UserRelationsResponse.ts diff --git a/assets/schemas.json b/assets/schemas.json index 476a43b521303ea24daac984636073424e1bf7f6..0ef1e5d90ce250da12f0f654281237e023943180 100644 GIT binary patch delta 4302 zcmbW3ZA_C_6vu;oS_`$A#Ns1ST-VrEx;r-vJZcAc$y?-(2HeJaNtp`JkSTCR%YED6qt_cF^&#Hhp zn3|UOWJKu;0HtqBW7vm-go#E^Xk?)><}&c~Ev(jb@5 z=;892HykKv!L$b!OnaMALvLE%3#R4RCX9(PNJ<9!;$Wc9kb@z~L~cAxwo?8wju0Ok{!is2zEpi8G79~QnD9PH35wW)u zlk46jxbA&(l|Ok$NaNCl1?~*FgiPC#VcM2b*2CNTf4b~>3Y0zHcWiU?Gfyf!^B9Xa zN4wHY;7Ut7&!6_m-21{pNZ^As2z>BXCI3NqS#lxqoP8TSXVX3Wl^dijHUn(2`@8X^ zVsbwyCg1rMMNXQx7ebS{xq9ZdM5CuTIeAif1fEpdiZQnoiPe4t zv06JtZMVT$I}FY`hEShok?qA0*i|NV=^X*Gm(gqY>=&V+CG6R%Z6TONRRdg!@!goMeX5Sum8U13g?+ zRWe`Cd~p%-)5uQ?UtHv_l`}zht|AiWDxwaPc{Cv!qY1jbJxneuYi6ehxH7sU2GJe* zLwy|E@;`trKUU&pm{&UoUhUjB12b_+#!<|1XD%FfKCJKOrdBo&tt>9;3dh;b`N($0 zucM^a*afi08ZHs;ziUAM-Gx8Wz=_H>H4C3wgz%|^9b6<$le(Nl=yH-)k@CT?F@h-- z$xtecM(R-}@nG2GKhJxd7For`u!?Ab)XdjzfvN$s87QiPLR zitkgtc%>8Z%AMjM*B9T~iQ-#d6jHprZ5PVhO5WmX+n1=exde)vU$|g?QF?}O%f;Pj zxmYGry=&R4MU!q^`!#qnM)iYbbiF&d{Y6y1qf7 zYwzu!d6Pk-8$qLIHYM#E^Pp?&Th~uKe%b#WF8lX2lK-jmdpvbk-{(V0@=`U@UmZd` z^BeZVZ>agFn>!uB8aRRney7Z1rw?N6^r2*qB^hhjO?xeF+UrV)ly|OU4~2R>6dLxB zGkm=P;p>NMIEH;`{zesko3|h#5Bkuozl{jIZ2Th@aXmRt6z}saRcw@B6H>+I#Wc4z zw*}hVRu|Qff1F5E9(lXm$!kY2c}<+TVw0N5|7)1=9P6fIvLqdcCF#Tu)BbyUWn}Ze DDb!1) diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 7e6bd04a..d9101159 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -22,17 +22,6 @@ import { Request, Response, Router } from "express"; const router = Router(); -export interface GatewayBotResponse { - url: string; - shards: number; - session_start_limit: { - total: number; - remaining: number; - reset_after: number; - max_concurrency: number; - }; -} - router.get( "/", route({ diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index 877b6efa..9100d5ee 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -22,10 +22,6 @@ import { Request, Response, Router } from "express"; const router = Router(); -export interface GatewayResponse { - url: string; -} - router.get( "/", route({ diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index 2836c563..650873ad 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -16,23 +16,23 @@ along with this program. If not, see . */ -import { Router, Request, Response } from "express"; -import { - User, - Member, - UserProfileModifySchema, - handleFile, - PrivateUserProjection, - emitEvent, - UserUpdateEvent, -} from "@spacebar/util"; import { route } from "@spacebar/api"; +import { + Member, + PrivateUserProjection, + User, + UserProfileModifySchema, + UserUpdateEvent, + emitEvent, + handleFile, +} from "@spacebar/util"; +import { Request, Response, Router } from "express"; const router: Router = Router(); router.get( "/", - route({ test: { response: { body: "UserProfileResponse" } } }), + route({ responses: { 200: { body: "UserProfileResponse" } } }), async (req: Request, res: Response) => { if (req.params.id === "@me") req.params.id = req.user_id; diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index dfe52a5e..f18672b1 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -16,15 +16,15 @@ along with this program. If not, see . */ -import { Router, Request, Response } from "express"; -import { User } from "@spacebar/util"; import { route } from "@spacebar/api"; +import { User } from "@spacebar/util"; +import { Request, Response, Router } from "express"; const router: Router = Router(); router.get( "/", - route({ test: { response: { body: "UserRelationsResponse" } } }), + route({ responses: { 200: { body: "UserRelationsResponse" } } }), async (req: Request, res: Response) => { const mutual_relations: object[] = []; const requested_relations = await User.findOneOrFail({ diff --git a/src/util/schemas/responses/GatewayBotResponse.ts b/src/util/schemas/responses/GatewayBotResponse.ts new file mode 100644 index 00000000..30f1f57f --- /dev/null +++ b/src/util/schemas/responses/GatewayBotResponse.ts @@ -0,0 +1,10 @@ +export interface GatewayBotResponse { + url: string; + shards: number; + session_start_limit: { + total: number; + remaining: number; + reset_after: number; + max_concurrency: number; + }; +} diff --git a/src/util/schemas/responses/GatewayResponse.ts b/src/util/schemas/responses/GatewayResponse.ts new file mode 100644 index 00000000..e909f7bd --- /dev/null +++ b/src/util/schemas/responses/GatewayResponse.ts @@ -0,0 +1,3 @@ +export interface GatewayResponse { + url: string; +} diff --git a/src/util/schemas/responses/UserProfileResponse.ts b/src/util/schemas/responses/UserProfileResponse.ts new file mode 100644 index 00000000..4e5cd8a6 --- /dev/null +++ b/src/util/schemas/responses/UserProfileResponse.ts @@ -0,0 +1,8 @@ +import { PublicConnectedAccount, UserPublic } from "../../entities"; + +export interface UserProfileResponse { + user: UserPublic; + connected_accounts: PublicConnectedAccount; + premium_guild_since?: Date; + premium_since?: Date; +} diff --git a/src/util/schemas/responses/UserRelationsResponse.ts b/src/util/schemas/responses/UserRelationsResponse.ts new file mode 100644 index 00000000..1ec15eca --- /dev/null +++ b/src/util/schemas/responses/UserRelationsResponse.ts @@ -0,0 +1,9 @@ +export interface UserRelationsResponse { + object: { + id?: string; + username?: string; + avatar?: string; + discriminator?: string; + public_flags?: number; + }; +} diff --git a/src/util/schemas/responses/index.ts b/src/util/schemas/responses/index.ts index 2a1180ad..49e8053b 100644 --- a/src/util/schemas/responses/index.ts +++ b/src/util/schemas/responses/index.ts @@ -9,7 +9,11 @@ export * from "./CaptchaRequiredResponse"; export * from "./ChannelInvitesResponse"; export * from "./ChannelPinsResponse"; export * from "./ChannelWebhooksResponse"; +export * from "./GatewayBotResponse"; +export * from "./GatewayResponse"; export * from "./GenerateRegistrationTokensResponse"; export * from "./LocationMetadataResponse"; export * from "./TokenResponse"; +export * from "./UserProfileResponse"; +export * from "./UserRelationsResponse"; export * from "./WebhookCreateResponse";