magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add RumaError to Error; encapsulate RumaResponse in api

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-08 18:54:42 +00:00
parent 7ba0777bd3
commit a43c78e55f
5 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/api/mod.rs
View file

@ -9,8 +9,7 @@ extern crate conduit_service as service;
pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result};
pub(crate) use service::{pdu::PduEvent, services, user_is_local};
pub(crate) use self::router::Ruma;
pub use self::router::RumaResponse;
pub(crate) use self::router::{Ruma, RumaResponse};
conduit::mod_ctor! {}
conduit::mod_dtor! {}

3
src/api/router/mod.rs
View file

@ -13,9 +13,8 @@ use ruma::{
CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
};
pub(super) use self::handler::RouterExt;
pub use self::response::RumaResponse;
use self::{auth::Auth, request::Request};
pub(super) use self::{handler::RouterExt, response::RumaResponse};
use crate::{service::appservice::RegistrationInfo, services, Error, Result};
/// Extractor for Ruma request structs

3
src/api/router/response.rs
View file

@ -5,8 +5,7 @@ use http::StatusCode;
use http_body_util::Full;
use ruma::api::{client::uiaa::UiaaResponse, OutgoingResponse};
#[derive(Clone)]
pub struct RumaResponse<T>(pub T);
pub(crate) struct RumaResponse<T>(pub(crate) T);
impl From<Error> for RumaResponse<UiaaResponse> {
fn from(t: Error) -> Self { Self(t.into()) }