Improve validate_token function, add type annotations

Also remove some extra spaces

Author: gameroman

examples/asynchronous_telebot/continue_handling.py

@@ -15,12 +15,12 @@ async def start2(message):
     This handler comes after the first one, but it will never be called.
     But you can call it by returning ContinueHandling() in the first handler.
 
-    If you return ContinueHandling() in the first handler, the next 
+    If you return ContinueHandling() in the first handler, the next
     registered handler with appropriate filters will be called.
     """
     await bot.send_message(message.chat.id, 'Hello World2!')
 
-import asyncio 
+import asyncio
 asyncio.run(bot.polling()) # just a reminder that infinity polling
 # wraps polling into try/except block just as sync version,
 # but you can use any of them because neither of them stops if you

examples/asynchronous_telebot/mini_app.py

@@ -1,16 +1,16 @@
 # The source of the "https://pytelegrambotminiapp.vercel.app" can be found in https://github.com/eternnoir/pyTelegramBotAPI/tree/master/examples/mini_app_web
 
 import asyncio
-from telebot.async_telebot import AsyncTeleBot 
+from telebot.async_telebot import AsyncTeleBot
 from telebot.types import (
-    ReplyKeyboardMarkup, 
-    KeyboardButton, 
+    ReplyKeyboardMarkup,
+    KeyboardButton,
     WebAppInfo,
     InlineKeyboardMarkup,
     InlineKeyboardButton
 )
 
-BOT_TOKEN = "" 
+BOT_TOKEN = ""
 WEB_URL = "https://pytelegrambotminiapp.vercel.app"
 
 bot = AsyncTeleBot(BOT_TOKEN)

examples/asynchronous_telebot/timer_bot_async.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# This is a simple bot with schedule timer 
+# This is a simple bot with schedule timer
 # https://github.com/ibrb/python-aioschedule
 # https://schedule.readthedocs.io
 

examples/continue_handling.py

@@ -15,7 +15,7 @@ def start2(message):
     This handler comes after the first one, but it will never be called.
     But you can call it by returning ContinueHandling() in the first handler.
 
-    If you return ContinueHandling() in the first handler, the next 
+    If you return ContinueHandling() in the first handler, the next
     registered handler with appropriate filters will be called.
     """
     bot.send_message(message.chat.id, 'Hello World2!')

examples/inline_example.py

@@ -42,7 +42,7 @@ def query_video(inline_query):
     try:
         r = types.InlineQueryResultVideo('1',
                                          'https://github.com/eternnoir/pyTelegramBotAPI/blob/master/tests/test_data/test_video.mp4?raw=true',
-                                         'video/mp4', 
+                                         'video/mp4',
                                          'https://raw.githubusercontent.com/eternnoir/pyTelegramBotAPI/master/examples/detailed_example/rooster.jpg',
                                          'Title'
                                          )

examples/message_reaction_example.py

@@ -3,11 +3,11 @@
 # This is a simple bot using message reactions (emoji)
 # https://core.telegram.org/bots/api#reactiontype
 # https://core.telegram.org/bots/api#update
-# allowed_updates: Specify an empty list to receive all update types except, chat_member, message_reaction, and message_reaction_count. 
-# If you want to receive message_reaction events, you cannot simply leave the allowed_updates=None default value. 
-# The default list of events does not include chat_member, message_reaction, and message_reaction_count events. 
-# You must explicitly specify all the events you wish to receive and add message_reaction to this list. 
-# It’s also important to note that after using allowed_updates=[...], in the future, using allowed_updates=None will mean 
+# allowed_updates: Specify an empty list to receive all update types except, chat_member, message_reaction, and message_reaction_count.
+# If you want to receive message_reaction events, you cannot simply leave the allowed_updates=None default value.
+# The default list of events does not include chat_member, message_reaction, and message_reaction_count events.
+# You must explicitly specify all the events you wish to receive and add message_reaction to this list.
+# It’s also important to note that after using allowed_updates=[...], in the future, using allowed_updates=None will mean
 # that the list of events you will receive will consist of the events you last explicitly specified.
 
 import random

examples/mini_app.py

@@ -2,15 +2,15 @@
 
 from telebot import TeleBot
 from telebot.types import (
-    ReplyKeyboardMarkup, 
-    KeyboardButton, 
+    ReplyKeyboardMarkup,
+    KeyboardButton,
     WebAppInfo,
     InlineKeyboardMarkup,
     InlineKeyboardButton
 )
 
-BOT_TOKEN = "" 
-WEB_URL = "https://pytelegrambotminiapp.vercel.app" 
+BOT_TOKEN = ""
+WEB_URL = "https://pytelegrambotminiapp.vercel.app"
 
 bot = TeleBot(BOT_TOKEN)
 

examples/stars_payment.py

@@ -1,6 +1,6 @@
 # Import required libraries
-import telebot 
-from telebot import types  
+import telebot
+from telebot import types
 
 bot = telebot.TeleBot('TOKEN')
 

telebot/__init__.py

@@ -168,7 +168,7 @@ def __init__(
             next_step_backend: Optional[HandlerBackend]=None, reply_backend: Optional[HandlerBackend]=None,
             exception_handler: Optional[ExceptionHandler]=None, last_update_id: Optional[int]=0,
             suppress_middleware_excepions: Optional[bool]=False, state_storage: Optional[StateStorageBase]=StateMemoryStorage(),
-            use_class_middlewares: Optional[bool]=False, 
+            use_class_middlewares: Optional[bool]=False,
             disable_web_page_preview: Optional[bool]=None,
             disable_notification: Optional[bool]=None,
             protect_content: Optional[bool]=None,
@@ -1571,7 +1571,7 @@ def get_chat_administrators(self, chat_id: Union[int, str]) -> List[types.ChatMe
         On success, returns an Array of ChatMember objects that contains
         information about all chat administrators except other bots.
 
-        Telegram documentation: https://core.telegram.org/bots/api#getchatadministrators    
+        Telegram documentation: https://core.telegram.org/bots/api#getchatadministrators
 
         :param chat_id: Unique identifier for the target chat or username
             of the target supergroup or channel (in the format @channelusername)
@@ -7051,7 +7051,7 @@ def create_new_sticker_set(
     def add_sticker_to_set(
             self, user_id: int, name: str, emojis: Union[List[str], str],
             png_sticker: Optional[Union[Any, str]]=None, 
-            tgs_sticker: Optional[Union[Any, str]]=None,  
+            tgs_sticker: Optional[Union[Any, str]]=None,
             webm_sticker: Optional[Union[Any, str]]=None,
             mask_position: Optional[types.MaskPosition]=None,
             sticker: Optional[types.InputSticker]=None) -> bool:

telebot/apihelper.py

@@ -190,7 +190,7 @@ def _check_result(method_name, result):
             raise ApiHTTPException(method_name, result)
         else:
             raise ApiInvalidJSONException(method_name, result)
-    else:    
+    else:
         if not result_json['ok']:
             raise ApiTelegramException(method_name, result, result_json)
 
@@ -2496,9 +2496,9 @@ def convert_input_media_array(array):
             if 'thumbnail' in media_dict:
                 thumbnail = media_dict['thumbnail']
                 if isinstance(thumbnail, types.InputFile):
-                    thumbnail_key = 'thumbnail_' + key  
-                    files[thumbnail_key] = thumbnail    
-                    media_dict['thumbnail'] = 'attach://' + thumbnail_key   
+                    thumbnail_key = 'thumbnail_' + key
+                    files[thumbnail_key] = thumbnail
+                    media_dict['thumbnail'] = 'attach://' + thumbnail_key
             media.append(media_dict)
     return json.dumps(media), files