HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

fix: don't return all members on message query / search

Browse Source
This commit is contained in:
Paul Makles
2022-01-03 15:21:12 +00:00
parent 345c4c627c
commit ce68f7eeed
9 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/channels/members_fetch.rs
View File

@@ -16,7 +16,7 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
}
if let Channel::Group { recipients, .. } = target {
Ok(json!(user.fetch_multiple_users(recipients).await?))
Ok(json!(user.fetch_multiple_users(&recipients).await?))
} else {
Err(Error::InvalidOperation)
}

4
src/routes/channels/message_query.rs
View File

@@ -166,13 +166,13 @@ pub async fn req(user: User, target: Ref, options: Options) -> Result<Value> {
ids.remove(&user.id);
let user_ids = ids.into_iter().collect();
let users = user.fetch_multiple_users(user_ids).await?;
let users = user.fetch_multiple_users(&user_ids).await?;
if let Channel::TextChannel { server, .. } = target {
Ok(json!({
"messages": messages,
"users": users,
"members": Server::fetch_members(&server).await?
"members": Server::fetch_members_with_ids(&server, &user_ids).await?
}))
} else {
Ok(json!({

8
src/routes/channels/message_search.rs
View File

@@ -108,10 +108,10 @@ pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Valu
}
},
Sort::Latest => doc! {
"_id": -1
"_id": -1 as i32
},
Sort::Oldest => doc! {
"_id": 1
"_id": 1 as i32
}
}
)
@@ -142,13 +142,13 @@ pub async fn req(user: User, target: Ref, options: Json<Options>) -> Result<Valu
ids.remove(&user.id);
let user_ids = ids.into_iter().collect();
let users = user.fetch_multiple_users(user_ids).await?;
let users = user.fetch_multiple_users(&user_ids).await?;
if let Channel::TextChannel { server, .. } = target {
Ok(json!({
"messages": messages,
"users": users,
"members": Server::fetch_members(&server).await?
"members": Server::fetch_members_with_ids(&server, &user_ids).await?
}))
} else {
Ok(json!({

2
src/routes/servers/member_fetch_all.rs
View File

@@ -46,6 +46,6 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
Ok(json!({
"members": members,
"users": user.fetch_multiple_users(member_ids).await?
"users": user.fetch_multiple_users(&member_ids).await?
}))
}