nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

State resolution outline for /send

Browse source
This commit is contained in:
Devin Ragotzy 2020-12-22 12:45:35 -05:00
parent fb9880fee9
commit 4a92a29b56
6 changed files with 384 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ruma_wrapper.rs
View file

@ -1,6 +1,6 @@
use crate::Error;
use ruma::{
api::{AuthScheme, OutgoingRequest},
api::{AuthScheme, IncomingRequest, OutgoingRequest},
identifiers::{DeviceId, UserId},
Outgoing,
};
@ -29,7 +29,7 @@ use {
/// This struct converts rocket requests into ruma structs by converting them into http requests
/// first.
pub struct Ruma<T: Outgoing> {
pub struct Ruma<T: Outgoing + OutgoingRequest> {
pub body: T::Incoming,
pub sender_user: Option<UserId>,
pub sender_device: Option<Box<DeviceId>>,
@ -40,10 +40,7 @@ pub struct Ruma<T: Outgoing> {
#[cfg(feature = "conduit_bin")]
impl<'a, T: Outgoing + OutgoingRequest> FromTransformedData<'a> for Ruma<T>
where
<T as Outgoing>::Incoming: TryFrom<http::request::Request<std::vec::Vec<u8>>> + std::fmt::Debug,
<<T as Outgoing>::Incoming as std::convert::TryFrom<
http::request::Request<std::vec::Vec<u8>>,
>>::Error: std::fmt::Debug,
T::Incoming: IncomingRequest,
{
type Error = ();
type Owned = Data;
@ -152,8 +149,7 @@ where
let http_request = http_request.body(body.clone()).unwrap();
debug!("{:?}", http_request);
match <T as Outgoing>::Incoming::try_from(http_request) {
match <T::Incoming as IncomingRequest>::try_from_http_request(http_request) {
Ok(t) => Success(Ruma {
body: t,
sender_user,
@ -173,7 +169,7 @@ where
}
}
impl<T: Outgoing> Deref for Ruma<T> {
impl<T: Outgoing + OutgoingRequest> Deref for Ruma<T> {
type Target = T::Incoming;
fn deref(&self) -> &Self::Target {