From a887608d30a728e677b5a8595c695fc55788f89c Mon Sep 17 00:00:00 2001 From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:09:02 +0200 Subject: [PATCH] Fix msg component typings --- assets/openapi.json | Bin 582218 -> 601458 bytes assets/schemas.json | Bin 19589397 -> 23000385 bytes src/util/entities/Message.ts | 77 +++++++++++++++++- src/util/schemas/MessageCreateSchema.ts | 4 +- .../responses/GuildMessagesSearchResponse.ts | 4 +- 5 files changed, 77 insertions(+), 8 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index 2788cdb08bb2d9d7ee2a458cbee2a0f133cee203..f3ad32a91baffeb6a23de34cb69f65748e111e90 100644 GIT binary patch delta 3936 zcmeHKeN0=|71zD@y=NN;wL=2_AjUY5w8;W?+91*<#Q9o7+7JREt(Fk{Y#!joy!Wup z8rEn9X%cF?CWM=Dv^8moCN0|^TTMW7x~d)YBWjnfg{o3M=rUNhHL0`&(qz)QRoi{f z7;s6Y{<%q$Z0Y*m^YJ_9o^$Tczk6%>tt&Bgar1#Jfoe9W8yxpo+1W6p>-t zLRLfna>N@C?)R)&U%$Et##C+<#D{P(c>Zo!LCre~!1n^GPg+6Q$dU3`_<3r*myXpf zrK3?Nw`0bY6Ac#f06}y|Etp?lYUkYt2x3OEK z18p`fVc=bi?7EN^Ff1;`UPFx(RavrVXJNVE4v5iEkXpKJNP#_OWT&2YjPTPJkQE+z z5a;uXDz>#VoAxYiAw{IdP(%vCtNbPKbT=}?1OqbIRk*}Q&FeT`k!zGE z=}EC0%x8oG@NY!fS$jKFsbsT$^)+DGh?n$U%7?0PbQtdW0&6Y6foC6b>x}~a0(NG# z$6|`SRcU2#B`SWD5B@gJ1fE^QJts*$CCe-bz7rr3- zaI8{R+gahKfpP1od(LAoR9{DxP(6-JAY4UxFls{&KztAzSQ1Q&=7+9;5knMizq)5hwD3(`74-)MdZJqMB*2std%%1W2^yR^bM&|)Zvhf`_$8DBo#&8KNSdZ%z@}pa&r7T@ zMyGKu+?d9B)Un$NUz|d@s0@_vaVx<8Bf+6p!{D)|>nLL`!+JQwkFsgU^a|h~r&xyk zZ(}3<`D-(ai!%#UPP;DJpg$88vGgpV@zpNy-AfF#KX?G*&B#b%9V#6dQj^2ee3f&6 z{~2U8hQ*-NqJ$g4`yn|%M}K4Fw7z7L&*#kH*d{fJ?cvyN69-X0618W`g8sGl>YbqMSZCF^oo=DaA=5>JN%4Q$Z4 zSxs+*&fg=c_XJPBU*QB7Z*)?Ba6NeLaK*G!U6E{&;eY`2uY~!k7pSelqP?yr_NXVD zJw5lyCQcou5}zv0de$UvZBk^+D5n}ygQVA3SdyEmOZ+yd4&>lwfBDNeH++1CJg(t} zsXM45t(3QGKzH!%(U{Uo2W~r)B{FliFm^j47 z{BRF(K);NagZcwv`t_%1%_4a2Ho68qN6|sO%@QBnLBCy{X5FnlD0`^?vJ3j3BN?=( zw^-vO>p&gimxJdqbTWDS{o}=Y_M^}<9jLZ#`voV!oSh_R4 zrhs`oNWvi*ycKMisa+(j?PtN$PceCR$iugs*bd{Zq%`qKCH~Tg8gvplOA!mTM=QzV z#^PkD_71j%kq6@SxCAyGCGOr)3!U<>`6|iW2csLY(~x|>B`6fpTI#B)ha(Cy(m!n~ z0CNtmKmnMn0AHC!O91i*Vg+L5AA(D^*#$Tl$s$9HqA#rEM9y3^V7(<-~!1>5v` z?Ok@cU|3;9d5%#gnbABvV|<8c9mHTZnn^{i=QJq4u<>uj4W%gI0j49 zBcb^YTRE z)K$C>>kJI;zks!=8BI#VR0R@X*8%h$P48I(!O1@u(nLc->{{`aK2YAwgUJo^glYe-bB JHU8`6{{SaEmS6w? delta 516 zcmZvYKWGzi6vz4fxx4(T=7DF)Fh zDk47h4gR}H!4ML-;h9Z}I5@OHaFJq@sdOm4Hlswn20921pXKp=pZDc${TTTAxxacX z04rgO?%w7hfmTfJ!Y?Jwf{%|cl0DB0Jy?CsHFqd%rl4(GaEE#z-&9bY9|v0+Q0-IJ1!W{sW`dPo zZO6#J^hQAKN1~o&{R@;MEy7P1}y@U6hIq9SM=spHHbAfM_ze3i< A6aWAK diff --git a/assets/schemas.json b/assets/schemas.json index 00f86b3604f19db3f1eb55db5e1432de30d7d2a5..621a84b4476278260c1ca5e13cbce85cd24c1ed0 100644 GIT binary patch delta 300606 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 MUng9nM#bLrKiH2WO8@`> delta 18496 zcmdU%`BPI@6vyYrgq`pLO2Q5WwYUw43!oHGl&Xj*f`}{;$yh`zNEsDDYh-C%Fm05J z6n%=Q2$oWp9;D)v78UD;OFLBUs3SV1C^A~D&{q4B*pC0fJ^k$^H8gH^i@k9;oT@eNn9-J53Mbmw6+D-^ z=Y)9aV=PBg-7^noh*>r#QlejR)!F#gourUW^t}U!^Cp(h%xdr|>pj={-MA)pr!+3U>okWI3VP z%0Lwj3z)H0zbA#G1MfQc)6+g*Uj$vWr%D1b9aA=S8b)A5mU7fy&)6_Jk z%K0JHJ&-3+wWqf)&2Gz@0DB$`OV*fv-s3gq4v_cMBTT}c2t>iP%sEmtP}b?wMp*07 zvy3&t5)Djl^^Iokh{!Q%+$bG$N0Kyh9>MTd+q+q!~l(J1pUKE%!fi!wD=LiJMiFmNwoN|qx6j+YlA zb|MH{m=qS-j=`5NkI(oD!$j-8E7}I^eWTJam?Of(AP@yq+}uzE(;5(MEN5q^yY)9y z?e&dT^74pCj;;XCiH4PNO4=7^C8f)x@peFq68aDjQ$J~Z4*S`L&dN)OgAbfEh&a6skmQXJDjyXs-CdkSE zNqF%8BN0Q50@E{+qcEiK61?z5G(-S80Gu-<`Oykuz`gIWj+Wzg5kZol^ANbspM~h2I`XpaIdDE zZKnkcsr(TG42Upw82VC-qAV}DS%YB>-#l=8J%)R=*m7V7-5=gT(f{!L{=H!sCYF-t zUT)=wJJ!#YkA-A2sn6Km5;bLR%ZDuP02n=Xys?m)7fJ{t>mRYg4)Go4&7Wh zu${dq^nCAMH3%@2>eu_&W0+2agb%I~vKB+67@ra1E25+%6M;A;nx+;rl7)mO8v#c* zZ%y_i;0RR6$rlJX?EF25jMr*8Qh|V`?U_B`i*J?kX4>O8hY7kg>&;H{e(bOLm46_79K$+wUYSv564>OM$&*RBSP_ z6-w4kC&d_O&W1U<@Ev{clW6wR2C2*EdIla&}i;-|-uMg)_vU}zdtBA8-? roY8S)4gzba;Ydoz<`)nQ4dTLBMIyn_k0$hKlgMG_{={h{R)zln5. */ -import { Embed, MessageComponent, PollAnswer, PollMedia } from "@spacebar/util"; +import { ActionRowComponent, Embed, PollAnswer, PollMedia } from "@spacebar/util"; type Attachment = { id: string; @@ -54,7 +54,7 @@ export interface MessageCreateSchema { **/ attachments?: Attachment[]; sticker_ids?: string[]; - components?: MessageComponent[]; + components?: ActionRowComponent[]; // TODO: Fix TypeScript errors in src\api\util\handlers\Message.ts once this is enabled poll?: PollCreationSchema; enforce_nonce?: boolean; // For Discord compatibility, it's the default behavior here diff --git a/src/util/schemas/responses/GuildMessagesSearchResponse.ts b/src/util/schemas/responses/GuildMessagesSearchResponse.ts index 6121983e..ec41965b 100644 --- a/src/util/schemas/responses/GuildMessagesSearchResponse.ts +++ b/src/util/schemas/responses/GuildMessagesSearchResponse.ts @@ -17,9 +17,9 @@ */ import { + ActionRowComponent, Attachment, Embed, - MessageComponent, MessageType, Poll, PublicUser, @@ -42,7 +42,7 @@ export interface GuildMessagesSearchMessage { timestamp: string; edited_timestamp: string | null; flags: number; - components: MessageComponent[]; + components: ActionRowComponent[]; poll: Poll; hit: true; }