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

rename RumaResponse to Ra

Browse source 
It's very commonly used so having a short name is worthwhile, I think.
This commit is contained in:
Charles Hall 2024-05-18 18:59:46 -07:00
parent 230ebd3884
commit 7ea98dac72
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
38 changed files with 332 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,9 +18,7 @@ use ruma::{
use serde_json::value::to_raw_value;
use tracing::warn;
use crate::{
service::pdu::PduBuilder, services, Error, Result, Ruma, RumaResponse,
};
use crate::{service::pdu::PduBuilder, services, Error, Ra, Result, Ruma};
/// # `PUT /_matrix/client/r0/profile/{userId}/displayname`
///
@ -29,7 +27,7 @@ use crate::{
/// - 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<RumaResponse<set_display_name::v3::Response>> {
) -> Result<Ra<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())?;
@ -109,7 +107,7 @@ pub(crate) async fn set_displayname_route(
}
}
Ok(RumaResponse(set_display_name::v3::Response {}))
Ok(Ra(set_display_name::v3::Response {}))
}
/// # `GET /_matrix/client/r0/profile/{userId}/displayname`
@ -119,7 +117,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<RumaResponse<get_display_name::v3::Response>> {
) -> Result<Ra<get_display_name::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -132,12 +130,12 @@ pub(crate) async fn get_displayname_route(
)
.await?;
return Ok(RumaResponse(get_display_name::v3::Response {
return Ok(Ra(get_display_name::v3::Response {
displayname: response.displayname,
}));
}
Ok(RumaResponse(get_display_name::v3::Response {
Ok(Ra(get_display_name::v3::Response {
displayname: services().users.displayname(&body.user_id)?,
}))
}
@ -149,7 +147,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<RumaResponse<set_avatar_url::v3::Response>> {
) -> Result<Ra<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())?;
@ -231,7 +229,7 @@ pub(crate) async fn set_avatar_url_route(
};
}
Ok(RumaResponse(set_avatar_url::v3::Response {}))
Ok(Ra(set_avatar_url::v3::Response {}))
}
/// # `GET /_matrix/client/r0/profile/{userId}/avatar_url`
@ -242,7 +240,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<RumaResponse<get_avatar_url::v3::Response>> {
) -> Result<Ra<get_avatar_url::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -255,13 +253,13 @@ pub(crate) async fn get_avatar_url_route(
)
.await?;
return Ok(RumaResponse(get_avatar_url::v3::Response {
return Ok(Ra(get_avatar_url::v3::Response {
avatar_url: response.avatar_url,
blurhash: response.blurhash,
}));
}
Ok(RumaResponse(get_avatar_url::v3::Response {
Ok(Ra(get_avatar_url::v3::Response {
avatar_url: services().users.avatar_url(&body.user_id)?,
blurhash: services().users.blurhash(&body.user_id)?,
}))
@ -274,7 +272,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<RumaResponse<get_profile::v3::Response>> {
) -> Result<Ra<get_profile::v3::Response>> {
if body.user_id.server_name() != services().globals.server_name() {
let response = services()
.sending
@ -287,7 +285,7 @@ pub(crate) async fn get_profile_route(
)
.await?;
return Ok(RumaResponse(get_profile::v3::Response {
return Ok(Ra(get_profile::v3::Response {
displayname: response.displayname,
avatar_url: response.avatar_url,
blurhash: response.blurhash,
@ -302,7 +300,7 @@ pub(crate) async fn get_profile_route(
));
}
Ok(RumaResponse(get_profile::v3::Response {
Ok(Ra(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)?,