Renamed DatabaseConnection into Pool

src/state/generic.rs

@@ -6,18 +6,14 @@ use futures::future::BoxFuture;
 pub async fn generic<F>(
     bot: Throttle<Bot>,
     msg: Message,
-    db: DatabaseConnection,
+    db: Pool,
     dialogue: MainDialogue,
     check: F,
     no_text_message: impl Into<String> + Send,
     handler: PackagedHandler<String>,
 ) -> crate::Result<()>
 where
-    for<'a> F: FnOnce(
-            &'a Message,
-            &'a DatabaseConnection,
-            &'a str,
-        ) -> BoxFuture<'a, crate::Result<Option<String>>>
+    for<'a> F: FnOnce(&'a Message, &'a Pool, &'a str) -> BoxFuture<'a, crate::Result<Option<String>>>
         + Send,
 {
     let mut handler = handler.lock().await;

src/state/get_login.rs

@@ -1,11 +1,7 @@
 use crate::prelude::*;
 
 #[inline]
-async fn check_login(
-    _: &Message,
-    _: &DatabaseConnection,
-    login: &str,
-) -> crate::Result<Option<String>> {
+async fn check_login(_: &Message, _: &Pool, login: &str) -> crate::Result<Option<String>> {
     let is_valid = validate_field(login);
     if !is_valid {
         return Ok(Some("Invalid login. Try again".to_owned()));

src/state/get_master_pass.rs

@@ -7,7 +7,7 @@ use tokio::task::spawn_blocking;
 #[inline]
 async fn check_master_pass(
     msg: &Message,
-    db: &DatabaseConnection,
+    db: &Pool,
     master_pass: &str,
 ) -> crate::Result<Option<String>> {
     let user_id = msg.from().ok_or(NoUserInfo)?.id.0;

src/state/get_new_master_pass.rs

@@ -34,7 +34,7 @@ fn process_validity(validity: PasswordValidity) -> Result<(), String> {
 #[inline]
 async fn check_new_master_pass(
     _: &Message,
-    _: &DatabaseConnection,
+    _: &Pool,
     password: &str,
 ) -> crate::Result<Option<String>> {
     let validity = check_master_pass(password);

src/state/get_new_name.rs

@@ -4,7 +4,7 @@ use crate::prelude::*;
 #[inline]
 async fn check_new_account_name(
     msg: &Message,
-    db: &DatabaseConnection,
+    db: &Pool,
     name: &str,
 ) -> crate::Result<Option<String>> {
     let user_id = msg.from().ok_or(NoUserInfo)?.id.0;

src/state/get_password.rs

@@ -1,11 +1,7 @@
 use crate::prelude::*;
 
 #[inline]
-async fn check_password(
-    _: &Message,
-    _: &DatabaseConnection,
-    password: &str,
-) -> crate::Result<Option<String>> {
+async fn check_password(_: &Message, _: &Pool, password: &str) -> crate::Result<Option<String>> {
     let is_valid = validate_field(password);
     if !is_valid {
         return Ok(Some("Invalid password. Try again".to_owned()));

src/state/get_user.rs

@@ -132,7 +132,7 @@ fn user_from_vec(
 pub async fn get_user(
     bot: Throttle<Bot>,
     msg: Message,
-    db: DatabaseConnection,
+    db: Pool,
     dialogue: MainDialogue,
     handler: PackagedHandler<User>,
 ) -> crate::Result<()> {

src/state/handler.rs

@@ -65,7 +65,7 @@ type DynHanlder<T> = Box<
     dyn FnOnce(
             Throttle<Bot>,
             Message,
-            DatabaseConnection,
+            Pool,
             MainDialogue,
             MessageIds,
             T,
@@ -89,7 +89,7 @@ impl<T> Handler<T> {
         H: FnOnce(
                 Throttle<Bot>,
                 Message,
-                DatabaseConnection,
+                Pool,
                 MainDialogue,
                 MessageIds,
                 T,