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

refactor: small improvements

Browse source
This commit is contained in:
Timo Kösters 2022-04-06 18:49:46 +02:00
parent ee96a03d60
commit 566833111c
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server_server.rs
View file

@ -2991,6 +2991,11 @@ pub async fn get_devices_route(
return Err(Error::bad_config("Federation is disabled."));
}
let sender_servername = body
.sender_servername
.as_ref()
.expect("server is authenticated");
Ok(get_devices::v1::Response {
user_id: body.user_id.clone(),
stream_id: db
@ -3016,10 +3021,10 @@ pub async fn get_devices_route(
.collect(),
master_key: db
.users
.get_master_key(&body.user_id, |u| u == &body.user_id)?,
.get_master_key(&body.user_id, |u| u.server_name() == sender_servername)?,
self_signing_key: db
.users
.get_self_signing_key(&body.user_id, |u| u == &body.user_id)?,
.get_self_signing_key(&body.user_id, |u| u.server_name() == sender_servername)?,
})
}