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: fix poll in msg create schema --- src/api/util/handlers/Message.ts | 33 +++++++++++++++++---------------- src/util/schemas/MessageCreateSchema.ts | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'src') 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, + EVERYONE_MENTION, + getPermission, + getRights, Guild, + HERE_MENTION, Message, MessageCreateEvent, + MessageCreateSchema, + MessageType, MessageUpdateEvent, - getPermission, - getRights, - //CHANNEL_MENTION, - USER_MENTION, - ROLE_MENTION, Role, - EVERYONE_MENTION, - HERE_MENTION, - MessageType, + ROLE_MENTION, + Sticker, User, - Application, + //CHANNEL_MENTION, + USER_MENTION, 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 -- cgit 1.5.1