Upgrade Ruma

This commit is contained in:
Jonas Platte
2021-11-26 20:36:40 +01:00
parent 1fc616320a
commit 892a0525f2
25 changed files with 297 additions and 304 deletions

View File

@@ -29,7 +29,7 @@ use {
/// first.
pub struct Ruma<T: Outgoing> {
pub body: T::Incoming,
pub sender_user: Option<UserId>,
pub sender_user: Option<Box<UserId>>,
pub sender_device: Option<Box<DeviceId>>,
pub sender_servername: Option<Box<ServerName>>,
// This is None when body is not a valid string
@@ -86,7 +86,7 @@ where
registration
.get("as_token")
.and_then(|as_token| as_token.as_str())
.map_or(false, |as_token| token.as_deref() == Some(as_token))
.map_or(false, |as_token| token == Some(as_token))
}) {
match metadata.authentication {
AuthScheme::AccessToken | AuthScheme::QueryOnlyAccessToken => {
@@ -103,7 +103,7 @@ where
.unwrap()
},
|string| {
UserId::try_from(string.expect("parsing to string always works"))
Box::<UserId>::try_from(string.expect("parsing to string always works"))
.unwrap()
},
);