jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 21:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: pull request #251 from revoltchat/fix/zomatree/send-message-null

Browse Source
This commit is contained in:
Paul Makles
2023-06-04 19:29:07 +01:00
committed by GitHub
parent bf3e027067 a7a7e49e18
commit b1fdd7fc74
7 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/delta/src/routes/channels/message_edit.rs
View File

@@ -53,11 +53,7 @@ pub async fn req(
return Err(Error::CannotEditMessage);
}
if let Some(new_embeds) = &edit.embeds {
Message::validate_sum(&edit.content, new_embeds)?;
} else {
Message::validate_sum(&edit.content, &vec![])?;
}
Message::validate_sum(&edit.content, edit.embeds.as_deref().unwrap_or_default())?;
message.edited = Some(Timestamp::now_utc());
let mut partial = PartialMessage {
@@ -85,7 +81,7 @@ pub async fn req(
new_embeds.clear();
for embed in embeds {
new_embeds.push(embed.clone().into_embed(db, message.id.clone()).await?);
new_embeds.push(embed.clone().into_embed(db, &message.id).await?);
}
}

4
crates/delta/src/routes/channels/message_send.rs
View File

@@ -47,14 +47,14 @@ pub async fn message_send(
}
// Check permissions for embeds
if !data.embeds.is_empty() {
if data.embeds.as_ref().is_some_and(|v| !v.is_empty()) {
permissions
.throw_permission(db, Permission::SendEmbeds)
.await?;
}
// Check permissions for files
if !data.attachments.is_empty() {
if data.attachments.as_ref().is_some_and(|v| !v.is_empty()) {
permissions
.throw_permission(db, Permission::UploadFiles)
.await?;

2
crates/delta/src/routes/webhooks/webhook_execute_github.rs
View File

@@ -1065,7 +1065,7 @@ pub async fn webhook_execute_github(
let message_id = Ulid::new().to_string();
let embed = sendable_embed
.into_embed(legacy_db, message_id.clone())
.into_embed(legacy_db, &message_id)
.await?;
let mut message = Message {