Introduced GetUserExt

src/commands/add_account.rs

@@ -17,7 +17,7 @@ async fn get_master_pass(
 ) -> crate::Result<()> {
     dialogue.exit().await?;
 
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
 
     let account = spawn_blocking(move || {
         DecryptedAccount {

src/commands/delete.rs

@@ -6,7 +6,7 @@ pub async fn delete(
     db: Pool,
     locale: LocaleRef,
 ) -> crate::Result<()> {
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
 
     let markup = menu_markup("delete1", user_id, &db).await?;
 

src/commands/delete_all.rs

@@ -12,7 +12,7 @@ async fn get_master_pass(
     _: String,
 ) -> crate::Result<()> {
     dialogue.exit().await?;
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
 
     let mut txn = db.begin().await?;
     let result = (

src/commands/export.rs

@@ -29,7 +29,7 @@ async fn get_master_pass(
     dialogue.exit().await?;
 
     ids.delete(&bot).await?;
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
     let mut accounts = Vec::new();
 
     {

src/commands/get_account.rs

@@ -6,7 +6,7 @@ pub async fn get_account(
     db: Pool,
     locale: LocaleRef,
 ) -> crate::Result<()> {
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
 
     let markup = menu_markup("decrypt", user_id, &db).await?;
 

src/commands/get_accounts.rs

@@ -9,7 +9,7 @@ pub async fn get_accounts(
     db: Pool,
     locale: LocaleRef,
 ) -> crate::Result<()> {
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
     let mut account_names = Account::get_names(user_id, &db);
 
     let Some(mut text) = account_names.try_next().await? else {

src/commands/import.rs

@@ -38,7 +38,7 @@ async fn get_master_pass(
 ) -> crate::Result<()> {
     dialogue.exit().await?;
 
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
     let mut failed = Vec::new();
 
     {

src/commands/menu.rs

@@ -6,7 +6,7 @@ pub async fn menu(
     db: Pool,
     locale: LocaleRef,
 ) -> crate::Result<()> {
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
 
     let markup = menu_markup("get", user_id, &db).await?;
 

src/commands/set_master_pass.rs

@@ -16,8 +16,8 @@ async fn get_master_pass2(
     master_pass: String,
 ) -> crate::Result<()> {
     dialogue.exit().await?;
-    let from = msg.from.as_ref().ok_or(NoUserInfo)?;
-    let user_id = from.id.0;
+    let from = msg.get_user()?;
+    let user_id = msg.get_user_id()?;
 
     if !hash.verify(master_pass.as_bytes()) {
         ids.alter_message(
@@ -82,7 +82,7 @@ pub async fn set_master_pass(
     db: Pool,
     locale: LocaleRef,
 ) -> crate::Result<()> {
-    let user_id = msg.from.as_ref().ok_or(NoUserInfo)?.id.0;
+    let user_id = msg.get_user_id()?;
     if MasterPass::exists(user_id, &db).await? {
         bot.send_message(msg.chat.id, &locale.master_password_is_set)
             .reply_markup(deletion_markup(locale))