Merge pull request #1456 from abdullaev388/master

I18N class for sync telebot and middleware for async

telebot/asyncio_filters.py

@@ -92,39 +92,33 @@ class TextFilter:
 
         if self.ignore_case:
             text = text.lower()
-
-            if self.equals:
-                self.equals = self.equals.lower()
-            elif self.contains:
-                self.contains = tuple(map(str.lower, self.contains))
-            elif self.starts_with:
-                self.starts_with = tuple(map(str.lower, self.starts_with))
-            elif self.ends_with:
-                self.ends_with = tuple(map(str.lower, self.ends_with))
+            prepare_func = lambda string: str(string).lower()
+        else:
+            prepare_func = str
 
         if self.equals:
-            result = self.equals == text
+            result = prepare_func(self.equals) == text
             if result:
                 return True
             elif not result and not any((self.contains, self.starts_with, self.ends_with)):
                 return False
 
         if self.contains:
-            result = any([i in text for i in self.contains])
+            result = any([prepare_func(i) in text for i in self.contains])
             if result:
                 return True
             elif not result and not any((self.starts_with, self.ends_with)):
                 return False
 
         if self.starts_with:
-            result = any([text.startswith(i) for i in self.starts_with])
+            result = any([text.startswith(prepare_func(i)) for i in self.starts_with])
             if result:
                 return True
             elif not result and not self.ends_with:
                 return False
 
         if self.ends_with:
-            return any([text.endswith(i) for i in self.ends_with])
+            return any([text.endswith(prepare_func(i)) for i in self.ends_with])
 
         return False
 

telebot/asyncio_handler_backends.py

@@ -1,14 +1,15 @@
 class BaseMiddleware:
     """
     Base class for middleware.
-
     Your middlewares should be inherited from this class.
     """
+
     def __init__(self):
         pass
 
     async def pre_process(self, message, data):
         raise NotImplementedError
+
     async def post_process(self, message, data, exception):
         raise NotImplementedError
 
@@ -16,9 +17,10 @@ class BaseMiddleware:
 class State:
     def __init__(self) -> None:
         self.name = None
+
     def __str__(self) -> str:
         return self.name
-    
+
 
 class StatesGroup:
     def __init_subclass__(cls) -> None:
@@ -26,4 +28,4 @@ class StatesGroup:
         for name, value in cls.__dict__.items():
             if not name.startswith('__') and not callable(value) and isinstance(value, State):
                 # change value of that variable
-                value.name = ':'.join((cls.__name__, name))
+                value.name = ':'.join((cls.__name__, name))

telebot/util.py

@@ -21,6 +21,7 @@ try:
     # noinspection PyPackageRequirements
     from PIL import Image
     from io import BytesIO
+
     pil_imported = True
 except:
     pil_imported = False
@@ -39,16 +40,17 @@ content_type_media = [
 content_type_service = [
     'new_chat_members', 'left_chat_member', 'new_chat_title', 'new_chat_photo', 'delete_chat_photo', 'group_chat_created',
     'supergroup_chat_created', 'channel_chat_created', 'migrate_to_chat_id', 'migrate_from_chat_id', 'pinned_message',
-    'proximity_alert_triggered', 'voice_chat_scheduled', 'voice_chat_started', 'voice_chat_ended', 
+    'proximity_alert_triggered', 'voice_chat_scheduled', 'voice_chat_started', 'voice_chat_ended',
     'voice_chat_participants_invited', 'message_auto_delete_timer_changed'
 ]
 
 update_types = [
-    "update_id", "message", "edited_message", "channel_post", "edited_channel_post", "inline_query", 
-    "chosen_inline_result", "callback_query", "shipping_query", "pre_checkout_query", "poll", "poll_answer", 
+    "update_id", "message", "edited_message", "channel_post", "edited_channel_post", "inline_query",
+    "chosen_inline_result", "callback_query", "shipping_query", "pre_checkout_query", "poll", "poll_answer",
     "my_chat_member", "chat_member", "chat_join_request"
 ]
 
+
 class WorkerThread(threading.Thread):
     count = 0
 
@@ -217,7 +219,7 @@ def pil_image_to_file(image, extension='JPEG', quality='web_low'):
         photoBuffer = BytesIO()
         image.convert('RGB').save(photoBuffer, extension, quality=quality)
         photoBuffer.seek(0)
-        
+
         return photoBuffer
     else:
         raise RuntimeError('PIL module is not imported')
@@ -338,7 +340,7 @@ def user_link(user: types.User, include_id: bool=False) -> str:
     :return: HTML user link
     """
     name = escape(user.first_name)
-    return (f"<a href='tg://user?id={user.id}'>{name}</a>" 
+    return (f"<a href='tg://user?id={user.id}'>{name}</a>"
         + (f" (<pre>{user.id}</pre>)" if include_id else ""))
 
 
@@ -477,6 +479,7 @@ def webhook_google_functions(bot, request):
     else:
         return 'Bot ON'
 
+
 def antiflood(function, *args, **kwargs):
     """
     Use this function inside loops in order to avoid getting TooManyRequests error.