From e00b65b0e0275eff0fc070c95ede7c6c0196f197 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 1 May 2024 00:00:56 -0400 Subject: [PATCH] use ok_or_else instead of ok_or for backup.rs Signed-off-by: strawberry --- src/api/client_server/backup.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/api/client_server/backup.rs b/src/api/client_server/backup.rs index dffcd011..4dcb5ce9 100644 --- a/src/api/client_server/backup.rs +++ b/src/api/client_server/backup.rs @@ -52,7 +52,7 @@ pub(crate) async fn get_latest_backup_info_route( let (version, algorithm) = services() .key_backups .get_latest_backup(sender_user)? - .ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?; + .ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?; Ok(get_latest_backup_info::v3::Response { algorithm, @@ -62,7 +62,7 @@ pub(crate) async fn get_latest_backup_info_route( }) } -/// # `GET /_matrix/client/r0/room_keys/version` +/// # `GET /_matrix/client/v3/room_keys/version/{version}` /// /// Get information about an existing backup. pub(crate) async fn get_backup_info_route( @@ -72,7 +72,7 @@ pub(crate) async fn get_backup_info_route( let algorithm = services() .key_backups .get_backup(sender_user, &body.version)? - .ok_or(Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?; + .ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Key backup does not exist."))?; Ok(get_backup_info::v3::Response { algorithm, @@ -274,10 +274,7 @@ pub(crate) async fn get_backup_keys_for_session_route( let key_data = services() .key_backups .get_session(sender_user, &body.version, &body.room_id, &body.session_id)? - .ok_or(Error::BadRequest( - ErrorKind::NotFound, - "Backup key not found for this user's session.", - ))?; + .ok_or_else(|| Error::BadRequest(ErrorKind::NotFound, "Backup key not found for this user's session."))?; Ok(get_backup_keys_for_session::v3::Response { key_data,