From 3c834d06d42a453de1abac7be843ecfec71f83b2 Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Sat, 3 Jun 2023 17:49:31 +0100 Subject: [PATCH] fix: must not restrict lowerbound for embeds --- .../src/impl/generic/channels/channel.rs | 20 +++++++++---------- crates/quark/src/models/channels/message.rs | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/quark/src/impl/generic/channels/channel.rs b/crates/quark/src/impl/generic/channels/channel.rs index cfcb7ce5..ee4067b2 100644 --- a/crates/quark/src/impl/generic/channels/channel.rs +++ b/crates/quark/src/impl/generic/channels/channel.rs @@ -495,16 +495,6 @@ impl Channel { .replace(replies.into_iter().collect::>()); } - // Process included embeds. - let mut embeds = vec![]; - for sendable_embed in data.embeds { - embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?) - } - - if !embeds.is_empty() { - message.embeds.replace(embeds); - } - // Add attachments to message. let mut attachments = vec![]; if data.attachments.len() > *MAX_ATTACHMENT_COUNT { @@ -524,6 +514,16 @@ impl Channel { message.attachments.replace(attachments); } + // Process included embeds. + let mut embeds = vec![]; + for sendable_embed in data.embeds { + embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?) + } + + if !embeds.is_empty() { + message.embeds.replace(embeds); + } + // Set content message.content = data.content; diff --git a/crates/quark/src/models/channels/message.rs b/crates/quark/src/models/channels/message.rs index 066afa08..09e2b5d9 100644 --- a/crates/quark/src/models/channels/message.rs +++ b/crates/quark/src/models/channels/message.rs @@ -277,7 +277,7 @@ pub struct DataMessageSend { /// /// Text embed content contributes to the content length cap #[serde(default)] - #[validate(length(min = 1, max = 10))] + #[validate(length(min = 0, max = 10))] pub embeds: Vec, /// Masquerade to apply to this message #[validate]