Merge pull request #65 from d-Rickyy-b/feature_optimize_code

Optimize code

Author: devcarron

main.py

@@ -32,7 +32,8 @@
 logfile_handler = logging.handlers.WatchedFileHandler(logfile_path, 'a', 'utf-8')
 
 logger = logging.getLogger(__name__)
-logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', level=logging.INFO, handlers=[logfile_handler])
+logging.basicConfig(format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', level=logging.INFO,
+                    handlers=[logfile_handler])
 
 if not re.match("[0-9]+:[a-zA-Z0-9\-_]+", BOT_TOKEN):
     logging.error("Bot token not correct - please check.")
@@ -42,7 +43,6 @@
 dispatcher = updater.dispatcher
 
 game_handler = GameHandler().get_instance()
-tg_bot = updater.bot
 
 
 # -----------------
@@ -79,8 +79,8 @@ def callback_eval(bot, update):
 
 
 def send_message(chat_id, text, message_id=None, parse_mode=None, reply_markup=None, game_id=None):
-    tg_bot.sendMessage(chat_id=chat_id, text=text, reply_to_message_id=message_id, parse_mode=parse_mode,
-                       reply_markup=reply_markup)
+    updater.bot.sendMessage(chat_id=chat_id, text=text, reply_to_message_id=message_id, parse_mode=parse_mode,
+                            reply_markup=reply_markup)
 
 
 def send_mp_message(chat_id, text, message_id=None, parse_mode=None, reply_markup=None, game_id=None):
@@ -141,7 +141,7 @@ def error(bot, update, error):
     """Log Errors caused by Updates."""
     if update is None:
         return
-    
+
     logger.warning('Update "%s" caused error "%s"', update, error)
 
     db = DBwrapper.get_instance()
@@ -165,7 +165,9 @@ def admin_check(bot, update):
             return func(bot, update)
         else:
             update.message.reply_text('You have not the needed permissions to do that!')
-            logger.warning("User {} ({}, @{}) tried to use admin function '{}'!".format(user.id, user.first_name, user.username, func.__name__))
+            logger.warning(
+                "User {} ({}, @{}) tried to use admin function '{}'!".format(user.id, user.first_name, user.username,
+                                                                             func.__name__))
 
     return admin_check