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

Update ruma to latest, fix unstable origin feature in ruma

Browse source
This commit is contained in:
Devin Ragotzy 2020-10-27 19:10:09 -04:00 • committed by Timo Kösters
parent 49f6ab503a
commit 96dd3b2880
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
13 changed files with 577 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client_server/keys.rs
View file

@ -11,7 +11,7 @@ use ruma::{
uiaa::{AuthFlow, UiaaInfo},
},
},
encryption::IncomingUnsignedDeviceInfo,
encryption::UnsignedDeviceInfo,
};
use std::collections::{BTreeMap, HashSet};
@ -24,7 +24,7 @@ use rocket::{get, post};
)]
pub async fn upload_keys_route(
db: State<'_, Database>,
body: Ruma<upload_keys::Request<'_>>,
body: Ruma<upload_keys::Request>,
) -> ConduitResult<upload_keys::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
let sender_device = body.sender_device.as_ref().expect("user is authenticated");
@ -94,7 +94,7 @@ pub async fn get_keys_route(
Error::bad_database("all_device_keys contained nonexistent device.")
})?;
keys.unsigned = IncomingUnsignedDeviceInfo {
keys.unsigned = UnsignedDeviceInfo {
device_display_name: metadata.display_name,
};
@ -113,7 +113,7 @@ pub async fn get_keys_route(
),
)?;
keys.unsigned = IncomingUnsignedDeviceInfo {
keys.unsigned = UnsignedDeviceInfo {
device_display_name: metadata.display_name,
};