Support ContinueHandling

Author: byehack

telebot/__init__.py

@@ -37,7 +37,10 @@
 logger.setLevel(logging.ERROR)
 
 from telebot import apihelper, util, types
-from telebot.handler_backends import HandlerBackend, MemoryHandlerBackend, FileHandlerBackend, BaseMiddleware, CancelUpdate, SkipHandler, State
+from telebot.handler_backends import (
+    HandlerBackend, MemoryHandlerBackend, FileHandlerBackend, BaseMiddleware,
+    CancelUpdate, SkipHandler, State, ContinueHandling
+)
 from telebot.custom_filters import SimpleCustomFilter, AdvancedCustomFilter
 
 
@@ -6111,13 +6114,14 @@ def _run_middlewares_and_handler(self, message, handlers, middlewares, update_ty
                         if not process_handler: continue
                         for i in inspect.signature(handler['function']).parameters:
                             params.append(i)
+                        result = None
                         if len(params) == 1:
-                            handler['function'](message)
+                            result = handler['function'](message)
                         elif "data" in params:
                             if len(params) == 2:
-                                handler['function'](message, data)
+                                result = handler['function'](message, data)
                             elif len(params) == 3:
-                                handler['function'](message, data=data, bot=self)
+                                result = handler['function'](message, data=data, bot=self)
                             else:
                                 logger.error("It is not allowed to pass data and values inside data to the handler. Check your handler: {}".format(handler['function']))
                                 return
@@ -6132,8 +6136,9 @@ def _run_middlewares_and_handler(self, message, handlers, middlewares, update_ty
                             if len(data_copy) > len(params) - 1: # remove the message parameter
                                 logger.error("You are passing more parameters than the handler needs. Check your handler: {}".format(handler['function']))
                                 return
-                            handler["function"](message, **data_copy)
-                        break
+                            result = handler["function"](message, **data_copy)
+                        if not isinstance(result, ContinueHandling):
+                            break
                 except Exception as e:
                     handler_error = e
                     if self.exception_handler:

telebot/async_telebot.py

@@ -14,7 +14,7 @@
 
 # storages
 from telebot.asyncio_storage import StateMemoryStorage, StatePickleStorage, StateStorageBase
-from telebot.asyncio_handler_backends import BaseMiddleware, CancelUpdate, SkipHandler, State
+from telebot.asyncio_handler_backends import BaseMiddleware, CancelUpdate, SkipHandler, State, ContinueHandling
 
 from inspect import signature
 
@@ -493,16 +493,14 @@ async def _run_middlewares_and_handlers(self, message, handlers, middlewares, up
                     if not process_update: continue
                     for i in signature(handler['function']).parameters:
                         params.append(i)
+                    result = None
                     if len(params) == 1:
-                        await handler['function'](message)
-                        break
+                        result = await handler['function'](message)
                     elif "data" in params:
                         if len(params) == 2:
-                            await handler['function'](message, data)
-                            break
+                            result = await handler['function'](message, data)
                         elif len(params) == 3:
-                            await handler['function'](message, data=data, bot=self)
-                            break
+                            result = await handler['function'](message, data=data, bot=self)
                         else:
                             logger.error("It is not allowed to pass data and values inside data to the handler. Check your handler: {}".format(handler['function']))
                             return
@@ -517,7 +515,8 @@ async def _run_middlewares_and_handlers(self, message, handlers, middlewares, up
                         if len(data_copy) > len(params) - 1: # remove the message parameter
                             logger.error("You are passing more data than the handler needs. Check your handler: {}".format(handler['function']))
                             return
-                        await handler["function"](message, **data_copy)
+                        result = await handler["function"](message, **data_copy)
+                    if not isinstance(result, ContinueHandling):
                         break
             except Exception as e:
                 if self.exception_handler:

telebot/handler_backends.py

@@ -174,7 +174,6 @@ def __init__(self) -> None:
     def __str__(self) -> str:
         return self.name
 
-    
 
 class StatesGroup:
     """
@@ -192,9 +191,6 @@ def __init_subclass__(cls) -> None:
                 value.name = ':'.join((cls.__name__, name))
                 value.group = cls
 
-
-
-
 
 class BaseMiddleware:
     """
@@ -254,8 +250,6 @@ class SkipHandler:
     but will skip execution of handler.
     """
 
-    def __init__(self) -> None:
-        pass
 
 class CancelUpdate:
     """
@@ -266,5 +260,9 @@ class CancelUpdate:
     of post_process in middlewares.
     """
 
-    def __init__(self) -> None:
-        pass
+class ContinueHandling:
+    """
+    Class for continue updates in handlers.
+    Just return instance of this class 
+    in handlers to continue process.
+    """