jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: send message route not accepting null

Browse Source
This commit is contained in:
Zomatree
2023-06-04 18:46:49 +01:00
parent 3c834d06d4
commit a7a7e49e18
7 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/quark/src/impl/generic/channels/channel.rs
View File

@@ -11,7 +11,7 @@ use crate::{
},
tasks::{ack::AckEvent, process_embeds},
types::push::MessageAuthor,
variables::delta::{MAX_ATTACHMENT_COUNT, MAX_REPLY_COUNT},
variables::delta::{MAX_ATTACHMENT_COUNT, MAX_REPLY_COUNT, MAX_EMBED_COUNT},
web::idempotency::IdempotencyKey,
Database, Error, OverrideField, Ref, Result,
};
@@ -411,14 +411,14 @@ impl Channel {
mut idempotency: IdempotencyKey,
generate_embeds: bool,
) -> Result<Message> {
Message::validate_sum(&data.content, &data.embeds)?;
Message::validate_sum(&data.content, data.embeds.as_deref().unwrap_or_default())?;
idempotency.consume_nonce(data.nonce).await?;
// Check the message is not empty
if (data.content.as_ref().map_or(true, |v| v.is_empty()))
&& (data.attachments.is_empty())
&& (data.embeds.is_empty())
&& (data.attachments.as_ref().map_or(true, |v| v.is_empty()))
&& (data.embeds.as_ref().map_or(true, |v| v.is_empty()))
{
return Err(Error::EmptyMessage);
}
@@ -497,15 +497,21 @@ impl Channel {
// Add attachments to message.
let mut attachments = vec![];
if data.attachments.len() > *MAX_ATTACHMENT_COUNT {
if data.attachments.as_ref().is_some_and(|v| v.len() > *MAX_ATTACHMENT_COUNT) {
return Err(Error::TooManyAttachments {
max: *MAX_ATTACHMENT_COUNT,
});
}
for attachment_id in data.attachments {
if data.embeds.as_ref().is_some_and(|v| v.len() > *MAX_EMBED_COUNT) {
return Err(Error::TooManyEmbeds {
max: *MAX_EMBED_COUNT
})
}
for attachment_id in data.attachments.as_deref().unwrap_or_default() {
attachments.push(
db.find_and_use_attachment(&attachment_id, "attachments", "message", &message_id)
db.find_and_use_attachment(attachment_id, "attachments", "message", &message_id)
.await?,
);
}
@@ -516,8 +522,8 @@ impl Channel {
// Process included embeds.
let mut embeds = vec![];
for sendable_embed in data.embeds {
embeds.push(sendable_embed.into_embed(db, message_id.clone()).await?)
for sendable_embed in data.embeds.unwrap_or_default() {
embeds.push(sendable_embed.into_embed(db, &message_id).await?)
}
if !embeds.is_empty() {

6
crates/quark/src/impl/generic/channels/message.rs
View File

@@ -170,7 +170,7 @@ impl Message {
}
/// Validate the sum of content of a message is under threshold
pub fn validate_sum(content: &Option<String>, embeds: &Vec<SendableEmbed>) -> Result<()> {
pub fn validate_sum(content: &Option<String>, embeds: &[SendableEmbed]) -> Result<()> {
let mut running_total = 0;
if let Some(content) = content {
running_total += content.len();
@@ -353,13 +353,13 @@ impl From<SystemMessage> for String {
}
impl SendableEmbed {
pub async fn into_embed(self, db: &Database, message_id: String) -> Result<Embed> {
pub async fn into_embed(self, db: &Database, message_id: &str) -> Result<Embed> {
self.validate()
.map_err(|error| Error::FailedValidation { error })?;
let media = if let Some(id) = self.media {
Some(
db.find_and_use_attachment(&id, "attachments", "message", &message_id)
db.find_and_use_attachment(&id, "attachments", "message", message_id)
.await?,
)
} else {