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

Merge branch 'valkum-master-patch-25423' into 'master'

Browse source 
Make clippy happy (needless-return, etc.)

See merge request famedly/conduit!23
This commit is contained in:
Timo Kösters 2021-03-04 12:35:12 +00:00
commit bd6507eafb
7 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client_server/push.rs
View file

@ -95,7 +95,7 @@ pub async fn get_pushrule_route(
if let Some(rule) = rule {
Ok(get_pushrule::Response { rule }.into())
} else {
Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found.").into())
Err(Error::BadRequest(ErrorKind::NotFound, "Push rule not found."))
}
}

3
src/client_server/session.rs
View file

@ -119,8 +119,7 @@ pub async fn login_route(
let device_exists = body.device_id.as_ref().map_or(false, |device_id| {
db.users
.all_device_ids(&user_id)
.find(|x| x.as_ref().map_or(false, |v| v == device_id))
.is_some()
.any(|x| x.as_ref().map_or(false, |v| v == device_id))
});
if device_exists {