From 35c9a09ea52099d8ee7eb79a4683f9301dedecd4 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:27:24 +1000 Subject: [PATCH] fix poll in msg create schema --- assets/openapi.json | Bin 573995 -> 581490 bytes assets/schemas.json | Bin 18446882 -> 19250985 bytes src/api/util/handlers/Message.ts | 37 ++++++++++++------------ src/util/schemas/MessageCreateSchema.ts | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index f649c9b22c817a2f33ae5c7afdb99e5b8398c25f..0a211d3c30e6fecaff7eedb22937a8e90e8364c4 100644 GIT binary patch delta 1432 zcmc&!T})eL7|#2h)1LkSc0gzm+VNA}V6HzS5Faiw{2LBOlkz)270!B5bzN!sXggAH@MaS?H6dGH@5lys>cjKwK1(p;#1!BV>pjNr?$Gv_eysV=bKg+am@;H2;h7 zjLyUg(Zm>fv&^hUNpvZ1w|Bx}n%@_|pUN4vE|Ll-LkTe~2GF$%1M0AFGL}l>>c?ac zHN0!Vh8xgZLJ?R}S1Pt+jnrWJ9k8erP!GC{Ol|fzXre1`JxA{zZKU41SJ0jTHJ#XR zR=UEQ??aOURf&!fV&3j$G7f`9bb4)uXHUpzH2=5t$wAN`XLr-ZNTWs$;3K8+s)`*@ z`v=_8hk|QA`ZdIdU)=#Kb=a(QC2w0w=T^L$U?>rYjf(NC2*;@5Ya2dO%@k8Tg`=k%ytKs$H~UN+jMGIuApA*2vgtx-f%|bD)tNc6j4>NejtY zIK?pXGUbe#txf(nVkdMe{9F&avKQd#46EW|A{9pAGHFoutd&=KMER1$+Z|-EC<@J% zD5$gZSyfX}Lkjy;0gqQh?GrNK6dA}M*#9$YQrbtuD)YQH!4HR`LO3)|{}?*1S5U+_ zABd%7-CicUmBo}RiHa!2_<>jouPwkh_b`rnzPIQ?+Ypn%efr0u(cVIeno~+m;zTP^ zQ{(Als))#s#^~y@6TOvCQ?ihwg|KMKfDsKnP{$S{(!n-qJ`3mCa85^F#^1{|YV5N? z|3lh#DyxAaYbM!7lJ7c%2{{qNxnD^wz5kL;u yUA;Yg@0*9*2kCsc3fE4vRg&XNRRp;1RQPSBoXo^|^bT;F)3@q5=~lhQ^T|KZo%~Dy delta 373 zcmZ8cJxD@P80EY7`L0o~s3fz@M3=A>L2;|6I5Y$m&P6rY6e$Qn(eR+aG2s?pL())0 zU_|t)O9=6t^NHZ^`9D=mMkq5(W z(!;~^aqed_`drYCnLA*3@(4jbY45;HADD5`3w3;J$A-@;m_$K^(=mNz`VBB~OqkF% zV2ReKSJx544e=Tb!b; z0y6}=!{8EyC&<12DtOyZJJFvaU4KQ{YqHw%PZ47;WMas8dciYEuW2vML!ciLxq}zpy&YwnaE6*+6(=Ofg~dkVP?5kw?-+m5HKi-rxKI1NV)} diff --git a/assets/schemas.json b/assets/schemas.json index 7a57dfcf5dac412b69d459413e85bcc0240fe948..a77f86b6771c9397acc37934a29a2205f1064d2d 100644 GIT binary patch delta 109953 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 d8?WU$M8$^*$Qd15+vc&t1Xx{CixQtr{{r57x�K diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 85db26b2..64bcdd56 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -16,36 +16,36 @@ along with this program. If not, see . */ +import * as Sentry from "@sentry/node"; +import { EmbedHandlers } from "@spacebar/api"; import { + Application, + Attachment, Channel, + Config, Embed, + EmbedCache, emitEvent, - Guild, - Message, - MessageCreateEvent, - MessageUpdateEvent, + EVERYONE_MENTION, getPermission, getRights, + Guild, + HERE_MENTION, + Message, + MessageCreateEvent, + MessageCreateSchema, + MessageType, + MessageUpdateEvent, + Role, + ROLE_MENTION, + Sticker, + User, //CHANNEL_MENTION, USER_MENTION, - ROLE_MENTION, - Role, - EVERYONE_MENTION, - HERE_MENTION, - MessageType, - User, - Application, Webhook, - Attachment, - Config, - Sticker, - MessageCreateSchema, - EmbedCache, } from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { In } from "typeorm"; -import { EmbedHandlers } from "@spacebar/api"; -import * as Sentry from "@sentry/node"; const allow_empty = false; // TODO: check webhook, application, system author, stickers // TODO: embed gifs/videos/images @@ -66,6 +66,7 @@ export async function handleMessage(opts: MessageOptions): Promise { : undefined; const message = Message.create({ ...opts, + poll: opts.poll ? [opts.poll] : undefined, sticker_items: stickers, guild_id: channel.guild_id, channel_id: opts.channel_id, diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index be1c31be..495e2ebd 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -56,7 +56,7 @@ export interface MessageCreateSchema { sticker_ids?: string[]; components?: MessageComponent[]; // TODO: Fix TypeScript errors in src\api\util\handlers\Message.ts once this is enabled - //poll?: PollCreationSchema; + poll?: PollCreationSchema; enforce_nonce?: boolean; // For Discord compatibility, it's the default behavior here applied_tags?: string[]; // Not implemented yet, for webhooks in forums thread_name?: string; // Not implemented yet, for webhooks