More clippy fixes
This commit is contained in:
@ -26,15 +26,12 @@ where
|
||||
return Err(HandlerUsed.into());
|
||||
}
|
||||
|
||||
let text = match msg.text() {
|
||||
Some(text) => text.trim(),
|
||||
None => {
|
||||
handler
|
||||
.previous
|
||||
.alter_message(&bot, no_text_message, None, None)
|
||||
.await?;
|
||||
return Ok(());
|
||||
}
|
||||
let Some(text) = msg.text().map(str::trim) else {
|
||||
handler
|
||||
.previous
|
||||
.alter_message(&bot, no_text_message, None, None)
|
||||
.await?;
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if text == "/cancel" {
|
||||
|
@ -11,21 +11,17 @@ async fn check_master_pass(
|
||||
master_pass: &str,
|
||||
) -> crate::Result<Option<String>> {
|
||||
let user_id = msg.from().ok_or(NoUserInfo)?.id.0;
|
||||
let model = MasterPass::get(user_id, db).await?;
|
||||
let Some(model) = MasterPass::get(user_id, db).await? else {
|
||||
error!("User was put into the GetMasterPass state with no master password set");
|
||||
return Ok(Some(
|
||||
"No master password set. Use /cancel and set it by using /set_master_pass".to_owned(),
|
||||
));
|
||||
};
|
||||
|
||||
let is_valid = match model {
|
||||
Some(model) => {
|
||||
let hash: HashedBytes<_, _> = model.into();
|
||||
let master_pass = master_pass.to_owned();
|
||||
spawn_blocking(move || hash.verify(master_pass.as_bytes())).await?
|
||||
}
|
||||
None => {
|
||||
error!("User was put into the GetMasterPass state with no master password set");
|
||||
return Ok(Some(
|
||||
"No master password set. Use /cancel and set it by using /set_master_pass"
|
||||
.to_owned(),
|
||||
));
|
||||
}
|
||||
let is_valid = {
|
||||
let hash = HashedBytes::from(model);
|
||||
let master_pass = master_pass.to_owned();
|
||||
spawn_blocking(move || hash.verify(master_pass.as_bytes())).await?
|
||||
};
|
||||
|
||||
if !is_valid {
|
||||
|
Reference in New Issue
Block a user