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

42
src/api/client_server/profile.rs
View file

@ -18,7 +18,9 @@ use ruma::{
use serde_json::value::to_raw_value;
use tracing::warn;
use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
use crate::{
service::pdu::PduBuilder, services, Error, Result, Ruma, RumaResponse,
};
/// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
///
@ -27,7 +29,7 @@ use crate::{service::pdu::PduBuilder, services, Error, Result, Ruma};
/// - Also makes sure other users receive the update using presence EDUs
pub(crate) async fn set_displayname_route(
body: Ruma<set_display_name::v3::Request>,
) -> Result<set_display_name::v3::Response> {
) -> Result<RumaResponse<set_display_name::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
services().users.set_displayname(sender_user, body.displayname.clone())?;
@ -107,7 +109,7 @@ pub(crate) async fn set_displayname_route(
}
}
Ok(set_display_name::v3::Response {})
Ok(RumaResponse(set_display_name::v3::Response {}))
}
/// # `GET /_matrix/client/r0/profile/{userId}/displayname`
@ -117,7 +119,7 @@ pub(crate) async fn set_displayname_route(
/// - If user is on another server: Fetches displayname over federation
pub(crate) async fn get_displayname_route(
body: Ruma<get_display_name::v3::Request>,
) -> Result<get_display_name::v3::Response> {
) -> Result<RumaResponse<get_display_name::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -130,14 +132,14 @@ pub(crate) async fn get_displayname_route(
)
.await?;
return Ok(get_display_name::v3::Response {
return Ok(RumaResponse(get_display_name::v3::Response {
displayname: response.displayname,
});
}));
}
Ok(get_display_name::v3::Response {
Ok(RumaResponse(get_display_name::v3::Response {
displayname: services().users.displayname(&body.user_id)?,
})
}))
}
/// # `PUT /_matrix/client/r0/profile/{userId}/avatar_url`
@ -147,7 +149,7 @@ pub(crate) async fn get_displayname_route(
/// - Also makes sure other users receive the update using presence EDUs
pub(crate) async fn set_avatar_url_route(
body: Ruma<set_avatar_url::v3::Request>,
) -> Result<set_avatar_url::v3::Response> {
) -> Result<RumaResponse<set_avatar_url::v3::Response>> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
services().users.set_avatar_url(sender_user, body.avatar_url.clone())?;
@ -229,7 +231,7 @@ pub(crate) async fn set_avatar_url_route(
};
}
Ok(set_avatar_url::v3::Response {})
Ok(RumaResponse(set_avatar_url::v3::Response {}))
}
/// # `GET /_matrix/client/r0/profile/{userId}/avatar_url`
@ -240,7 +242,7 @@ pub(crate) async fn set_avatar_url_route(
/// federation
pub(crate) async fn get_avatar_url_route(
body: Ruma<get_avatar_url::v3::Request>,
) -> Result<get_avatar_url::v3::Response> {
) -> Result<RumaResponse<get_avatar_url::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -253,16 +255,16 @@ pub(crate) async fn get_avatar_url_route(
)
.await?;
return Ok(get_avatar_url::v3::Response {
return Ok(RumaResponse(get_avatar_url::v3::Response {
avatar_url: response.avatar_url,
blurhash: response.blurhash,
});
}));
}
Ok(get_avatar_url::v3::Response {
Ok(RumaResponse(get_avatar_url::v3::Response {
avatar_url: services().users.avatar_url(&body.user_id)?,
blurhash: services().users.blurhash(&body.user_id)?,
})
}))
}
/// # `GET /_matrix/client/r0/profile/{userId}`
@ -272,7 +274,7 @@ pub(crate) async fn get_avatar_url_route(
/// - If user is on another server: Fetches profile over federation
pub(crate) async fn get_profile_route(
body: Ruma<get_profile::v3::Request>,
) -> Result<get_profile::v3::Response> {
) -> Result<RumaResponse<get_profile::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -285,11 +287,11 @@ pub(crate) async fn get_profile_route(
)
.await?;
return Ok(get_profile::v3::Response {
return Ok(RumaResponse(get_profile::v3::Response {
displayname: response.displayname,
avatar_url: response.avatar_url,
blurhash: response.blurhash,
});
}));
}
if !services().users.exists(&body.user_id)? {
@ -300,9 +302,9 @@ pub(crate) async fn get_profile_route(
));
}
Ok(get_profile::v3::Response {
Ok(RumaResponse(get_profile::v3::Response {
avatar_url: services().users.avatar_url(&body.user_id)?,
blurhash: services().users.blurhash(&body.user_id)?,
displayname: services().users.displayname(&body.user_id)?,
})
}))
}