mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Adding checks for the commands and regexp input types

Browse Source
This commit is contained in:
Troshchk 2022-02-15 15:24:55 +01:00
parent 64a22457e2
commit 68095ad69a
1 changed files with 144 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
telebot/__init__.py
View File

@ -2783,9 +2783,25 @@ class TeleBot:
if content_types is None: if content_types is None:
content_types = ["text"] content_types = ["text"]
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("message_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("message_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("message_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2824,9 +2840,25 @@ class TeleBot:
:param pass_bot: Pass TeleBot to handler. :param pass_bot: Pass TeleBot to handler.
:return: decorated function :return: decorated function
""" """
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("register_message_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("register_message_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("register_message_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2856,9 +2888,25 @@ class TeleBot:
if content_types is None: if content_types is None:
content_types = ["text"] content_types = ["text"]
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("edited_message_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("edited_message_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("edited_message_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2897,9 +2945,25 @@ class TeleBot:
:param pass_bot: Pass TeleBot to handler. :param pass_bot: Pass TeleBot to handler.
:return: decorated function :return: decorated function
""" """
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("register_edited_message_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("register_edited_message_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("register_edited_message_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2929,9 +2993,25 @@ class TeleBot:
if content_types is None: if content_types is None:
content_types = ["text"] content_types = ["text"]
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("channel_post_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("channel_post_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("channel_post_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2968,9 +3048,25 @@ class TeleBot:
:param pass_bot: Pass TeleBot to handler. :param pass_bot: Pass TeleBot to handler.
:return: decorated function :return: decorated function
""" """
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("register_channel_post_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("register_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("register_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -2998,9 +3094,25 @@ class TeleBot:
if content_types is None: if content_types is None:
content_types = ["text"] content_types = ["text"]
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("edited_channel_post_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("edited_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("edited_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.")
@ -3037,9 +3149,25 @@ class TeleBot:
:param pass_bot: Pass TeleBot to handler. :param pass_bot: Pass TeleBot to handler.
:return: decorated function :return: decorated function
""" """
if isinstance(commands, str): if isinstance(commands, list) or isinstance(commands, set) or isinstance(commands, tuple):
logger.warning("register_edited_channel_post_handler: 'commands' filter should be List of strings (commands), not string.") if any(not isinstance(item, (str, int, float)) for item in commands):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter list. Not able to use.")
elif all(isinstance(item, str) for item in commands):
commands = list(commands)
else:
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not list of different types. Converting non-strings to strings.")
commands = [str(item) if not isinstance(item,str) else item for item in commands]
elif isinstance(commands, str):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not string. Converting to list of string.")
commands = [commands] commands = [commands]
elif isinstance(commands, (int, float)):
logger.warning("message_handler: 'commands' filter should be list of strings (commands), not numeric. Converting to the list of string.")
commands = [str(commands)]
elif not isinstance(commands, type(None)):
logger.warning("message_handler: commands' filter should be list of strings (commands), unknown type supplied to the 'commands' filter. Not able to use.")
if not isinstance(regexp, (str, type(None))):
logger.warning("message_handler: regex filter should be string. Not able to use the supplied type.")
if isinstance(content_types, str): if isinstance(content_types, str):
logger.warning("register_edited_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.") logger.warning("register_edited_channel_post_handler: 'content_types' filter should be List of strings (content types), not string.")