StNicolay/pass_manager
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Switched to teloxide 0.13

Browse Source
This commit is contained in:
StNicolay
2024-08-17 12:48:50 +03:00
parent 14b858808d
commit 374a9d91c7
29 changed files with 163 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/add_account.rs
View File

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

2
src/commands/delete.rs
View File

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

2
src/commands/delete_all.rs
View File

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

2
src/commands/export.rs
View File

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

2
src/commands/get_account.rs
View File

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

2
src/commands/get_accounts.rs
View File

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

2
src/commands/import.rs
View File

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

2
src/commands/menu.rs
View File

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

4
src/commands/set_master_pass.rs
View File

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