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

fix: set relationship for users in BulkMessageResponse

Browse Source
This commit is contained in:
TheBobBobs
2023-11-21 23:34:00 +00:00
committed by Paul Makles
parent aed8f69f34
commit 219c16a69c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/delta/src/routes/channels/message_query.rs
View File

@@ -91,7 +91,7 @@ pub async fn req(
}) })
.await?; .await?;
BulkMessageResponse::transform(db, Some(&channel), messages, include_users) BulkMessageResponse::transform(db, Some(&channel), messages, &user, include_users)
.await .await
.map(Json) .map(Json)
} }

2
crates/delta/src/routes/channels/message_search.rs
View File

@@ -90,7 +90,7 @@ pub async fn req(
}) })
.await?; .await?;
BulkMessageResponse::transform(db, Some(&channel), messages, include_users) BulkMessageResponse::transform(db, Some(&channel), messages, &user, include_users)
.await .await
.map(Json) .map(Json)
} }

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

@@ -382,11 +382,16 @@ impl BulkMessageResponse {
db: &Database, db: &Database,
channel: Option<&Channel>, channel: Option<&Channel>,
messages: Vec<Message>, messages: Vec<Message>,
user: &User,
include_users: Option<bool>, include_users: Option<bool>,
) -> Result<BulkMessageResponse> { ) -> Result<BulkMessageResponse> {
if let Some(true) = include_users { if let Some(true) = include_users {
let user_ids = messages.get_user_ids(); let user_ids = messages.get_user_ids();
let users = User::fetch_foreign_users(db, &user_ids).await?; let users = User::fetch_foreign_users(db, &user_ids)
.await?
.into_iter()
.map(|x| x.with_relationship(user))
.collect();
Ok(match channel { Ok(match channel {
Some(Channel::TextChannel { server, .. }) Some(Channel::TextChannel { server, .. })