Added a prelude to reduce the amount of imports
This commit is contained in:
@ -1,7 +1,5 @@
|
||||
use crate::{errors::HandlerUsed, markups::deletion_markup, utils::delete_optional};
|
||||
use crate::prelude::*;
|
||||
use futures::future::BoxFuture;
|
||||
use sea_orm::prelude::*;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
|
||||
/// A generic state handler. It checks for "/cancel" messages and runs the provided validation function
|
||||
#[inline]
|
||||
@ -9,10 +7,10 @@ pub async fn generic<F>(
|
||||
bot: Throttle<Bot>,
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: crate::MainDialogue,
|
||||
dialogue: MainDialogue,
|
||||
check: F,
|
||||
no_text_message: impl Into<String>,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()>
|
||||
where
|
||||
for<'a> F: FnOnce(
|
||||
|
@ -1,12 +1,4 @@
|
||||
use crate::{
|
||||
errors::{HandlerUsed, NoUserInfo},
|
||||
markups::{account_markup, deletion_markup},
|
||||
utils::delete_optional,
|
||||
MainDialogue,
|
||||
};
|
||||
use entity::prelude::*;
|
||||
use sea_orm::DatabaseConnection;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
use crate::prelude::*;
|
||||
|
||||
/// Checks that the account with that name exists
|
||||
#[inline]
|
||||
@ -33,7 +25,7 @@ pub async fn get_existing_name(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
let user_id = msg.from().ok_or(NoUserInfo)?.id.0;
|
||||
let mut handler = next.lock().await;
|
||||
|
@ -1,6 +1,4 @@
|
||||
use crate::{utils::validate_field, MainDialogue};
|
||||
use sea_orm::prelude::*;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
use crate::prelude::*;
|
||||
|
||||
/// Function to handle GetLogin state
|
||||
pub async fn get_login(
|
||||
@ -8,7 +6,7 @@ pub async fn get_login(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
super::generic::generic(
|
||||
bot,
|
||||
|
@ -1,9 +1,5 @@
|
||||
use crate::{errors::NoUserInfo, MainDialogue};
|
||||
use cryptography::prelude::*;
|
||||
use entity::prelude::*;
|
||||
use crate::prelude::*;
|
||||
use log::error;
|
||||
use sea_orm::DatabaseConnection;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
use tokio::task::spawn_blocking;
|
||||
|
||||
/// Returns true if the provided master password is valid
|
||||
@ -48,7 +44,7 @@ pub async fn get_master_pass(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
super::generic::generic(
|
||||
bot,
|
||||
|
@ -1,7 +1,5 @@
|
||||
use crate::MainDialogue;
|
||||
use crate::prelude::*;
|
||||
use cryptography::passwords::{check_master_pass, PasswordValidity};
|
||||
use sea_orm::DatabaseConnection;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
|
||||
#[inline]
|
||||
fn process_validity(validity: PasswordValidity) -> Result<(), String> {
|
||||
@ -56,7 +54,7 @@ pub async fn get_new_master_pass(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
super::generic::generic(
|
||||
bot,
|
||||
|
@ -1,7 +1,4 @@
|
||||
use crate::{errors::NoUserInfo, utils::validate_field, MainDialogue};
|
||||
use entity::prelude::*;
|
||||
use sea_orm::prelude::*;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
use crate::prelude::*;
|
||||
|
||||
/// Validates a new account
|
||||
#[inline]
|
||||
@ -34,7 +31,7 @@ pub async fn get_new_name(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
super::generic::generic(
|
||||
bot,
|
||||
|
@ -1,7 +1,4 @@
|
||||
use sea_orm::prelude::*;
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
|
||||
use crate::{utils::validate_field, MainDialogue};
|
||||
use crate::prelude::*;
|
||||
|
||||
/// Function to handle GetPassword state
|
||||
pub async fn get_password(
|
||||
@ -9,7 +6,7 @@ pub async fn get_password(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<String>,
|
||||
next: PackagedHandler<String>,
|
||||
) -> crate::Result<()> {
|
||||
super::generic::generic(
|
||||
bot,
|
||||
|
@ -1,17 +1,9 @@
|
||||
use crate::{
|
||||
errors::{HandlerUsed, NoUserInfo},
|
||||
markups::deletion_markup,
|
||||
models::{DecryptedAccount, User},
|
||||
utils::delete_optional,
|
||||
MainDialogue,
|
||||
};
|
||||
use entity::prelude::*;
|
||||
use futures::{future::try_join, TryStreamExt};
|
||||
use crate::prelude::*;
|
||||
use futures::future::try_join;
|
||||
use itertools::Itertools;
|
||||
use rustc_hash::FxHashSet;
|
||||
use sea_orm::prelude::*;
|
||||
use std::fmt::Write;
|
||||
use teloxide::{adaptors::Throttle, net::Download, prelude::*, types::Document};
|
||||
use teloxide::{net::Download, types::Document};
|
||||
use tokio::task::spawn_blocking;
|
||||
use trim_in_place::TrimInPlace;
|
||||
|
||||
@ -119,7 +111,7 @@ pub async fn get_user(
|
||||
msg: Message,
|
||||
db: DatabaseConnection,
|
||||
dialogue: MainDialogue,
|
||||
next: super::PackagedHandler<User>,
|
||||
next: PackagedHandler<User>,
|
||||
) -> crate::Result<()> {
|
||||
let user_id = msg.from().ok_or(NoUserInfo)?.id.0;
|
||||
let mut handler = next.lock().await;
|
||||
|
@ -1,8 +1,6 @@
|
||||
use crate::MainDialogue;
|
||||
use crate::prelude::*;
|
||||
use futures::future::BoxFuture;
|
||||
use sea_orm::prelude::*;
|
||||
use std::{future::Future, sync::Arc};
|
||||
use teloxide::{adaptors::Throttle, prelude::*};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
type DynHanlder<T> = Box<
|
||||
|
@ -19,8 +19,8 @@ pub use get_password::get_password;
|
||||
pub use get_user::get_user;
|
||||
pub use handler::{Handler, PackagedHandler};
|
||||
|
||||
use crate::models::User;
|
||||
use teloxide::{dispatching::dialogue::InMemStorage, prelude::*};
|
||||
use crate::prelude::*;
|
||||
use teloxide::dispatching::dialogue::InMemStorage;
|
||||
|
||||
#[derive(Default, Clone)]
|
||||
pub enum State {
|
||||
|
Reference in New Issue
Block a user