backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't automatically wrap in RumaResponse

Browse source 
This allows us to use the `ruma_route` convenience function even when we
need to add our own hacks into the responses, thus making us less
reliant on Ruma.
This commit is contained in:
Charles Hall 2024-05-18 18:31:36 -07:00
parent 87ac0e2a38
commit 230ebd3884
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
35 changed files with 438 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/client_server/user_directory.rs
View file

@ -6,7 +6,7 @@ use ruma::{
},
};
use crate::{services, Result, Ruma};
use crate::{services, Result, Ruma, RumaResponse};
/// # `POST /_matrix/client/r0/user_directory/search`
///
@ -17,7 +17,7 @@ use crate::{services, Result, Ruma};
/// and don't share a room with the sender
pub(crate) async fn search_users_route(
body: Ruma<search_users::v3::Request>,
) -> Result<search_users::v3::Response> {
) -> Result<RumaResponse<search_users::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
let limit = body.limit.try_into().unwrap_or(usize::MAX);
@ -99,8 +99,8 @@ pub(crate) async fn search_users_route(
let results = users.by_ref().take(limit).collect();
let limited = users.next().is_some();
Ok(search_users::v3::Response {
Ok(RumaResponse(search_users::v3::Response {
results,
limited,
})
}))
}