Update

tgbot/middlewares/__init__.py

@@ -1,11 +1,11 @@
 # - *- coding: utf- 8 - *-
 from aiogram import Dispatcher
 
-from tgbot.middlewares.middleware_user import ExistsUserMiddleware
 from tgbot.middlewares.middleware_throttling import ThrottlingMiddleware
+from tgbot.middlewares.middleware_user import ExistsUserMiddleware
 
 
-# Регистрация всех миддлварей
+# Register all middlewares
 def register_all_middlwares(dp: Dispatcher):
     dp.callback_query.outer_middleware(ExistsUserMiddleware())
     dp.message.outer_middleware(ExistsUserMiddleware())

tgbot/middlewares/middleware_throttling.py

@@ -8,7 +8,7 @@ from aiogram.types import Message, User
 from cachetools import TTLCache
 
 
-# Антиспам
+# Antiflood
 class ThrottlingMiddleware(BaseMiddleware):
     def __init__(self, default_rate: Union[int, float] = 0.5) -> None:
         self.default_rate = default_rate
@@ -49,15 +49,7 @@ class ThrottlingMiddleware(BaseMiddleware):
                     self.users[this_user.id]['count_throttled'] = 2
                     self.users[this_user.id]['now_rate'] = self.default_rate + 3
 
-                    await event.reply(
-                        "<b>❗ Пожалуйста, не спамьте.\n"
-                        "❗ Please, do not spam.</b>",
-                    )
+                    await event.reply("<b>❗ Please, do not spam.")
                 elif self.users[this_user.id]['count_throttled'] == 2:
                     self.users[this_user.id]['count_throttled'] = 3
                     self.users[this_user.id]['now_rate'] = self.default_rate + 5
-
-                    await event.reply(
-                        "<b>❗ Бот не будет отвечать до прекращения спама.\n"
-                        "❗ The bot will not respond until the spam stops.</b>",
-                    )

tgbot/middlewares/middleware_user.py

@@ -1,7 +1,7 @@
 # - *- coding: utf- 8 - *-
 from aiogram import BaseMiddleware
 
-from tgbot.database.db_users import Userx
+from tgbot.database.db_users import Usersx
 from tgbot.utils.const_functions import clear_html
 
 
@@ -11,7 +11,7 @@ class ExistsUserMiddleware(BaseMiddleware):
         this_user = data.get("event_from_user")
 
         if not this_user.is_bot:
-            get_user = Userx.get(user_id=this_user.id)
+            get_user = Usersx().get(user_id=this_user.id)
 
             user_id = this_user.id
             user_login = this_user.username
@@ -29,20 +29,20 @@ class ExistsUserMiddleware(BaseMiddleware):
             if len(user_surname) >= 1: user_fullname += f" {user_surname}"
 
             if get_user is None:
-                Userx.add(user_id, user_login.lower(), user_name, user_surname, user_fullname)
+                Usersx().add(user_id, user_login.lower(), user_name, user_surname, user_fullname)
             else:
                 if user_name != get_user.user_name:
-                    Userx.update(get_user.user_id, user_name=user_name)
+                    Usersx().update(get_user.user_id, user_name=user_name)
 
                 if user_surname != get_user.user_surname:
-                    Userx.update(get_user.user_id, user_surname=user_surname)
+                    Usersx().update(get_user.user_id, user_surname=user_surname)
 
                 if user_fullname != get_user.user_fullname:
-                    Userx.update(get_user.user_id, user_fullname=user_fullname)
+                    Usersx().update(get_user.user_id, user_fullname=user_fullname)
 
                 if user_login.lower() != get_user.user_login:
-                    Userx.update(get_user.user_id, user_login=user_login.lower())
+                    Usersx().update(get_user.user_id, user_login=user_login.lower())
 
-            data['User'] = Userx.get(user_id=user_id)
+            data['User'] = Usersx().get(user_id=user_id)
 
         return await handler(event, data)