Merge pull request #59 from d-Rickyy-b/dev

Some optimizations

Author: devcarron

main.py

@@ -135,6 +135,9 @@ def game_commands(bot, update):
 
 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()
@@ -203,7 +206,7 @@ def start_cmd(bot, update):
         if game.players[0].user_id == user_id:
             game.start_game()
         else:
-            update.message.reply_text("Only the creator can start the game")
+            message.reply_text("Only the creator ({}) can start the game".format(game.players[0].first_name))
 
 
 def stop_cmd(bot, update):
@@ -219,8 +222,6 @@ def stop_cmd(bot, update):
 
 def help_cmd(bot, update):
     # Explains commands to user
-
-    chat_id = update.message.chat_id
     db = DBwrapper.get_instance()
     lang_id = db.get_lang_id(update.message.from_user.id)
 
@@ -287,23 +288,21 @@ def language_cmd(bot, update):
                         reply_markup=lang_keyboard, message_id=update.message.message_id)
 
 
-def comment_cmd(bot, update):
+def comment_cmd(bot, update, args):
     user_id = update.message.from_user.id
     chat_id = update.message.chat_id
     first_name = update.message.from_user.first_name
     last_name = update.message.from_user.last_name
     username = update.message.from_user.username
     db = DBwrapper.get_instance()
     lang_id = db.get_lang_id(user_id)
-    text = update.message.text
-    params = text.split()
 
     state_handler = StateHandler.get_instance()
     user = state_handler.get_user(user_id)
 
     if user.get_state() == UserState.IDLE:
-        if len(params) > 1:
-            text = " ".join(params[1:])
+        if len(args) > 1:
+            text = " ".join(args)
             logger.debug("New comment! {}!".format(user_id))
 
             bot.sendMessage(chat_id=chat_id, text=translate("userComment", lang_id))
@@ -312,7 +311,6 @@ def comment_cmd(bot, update):
                                 "New comment:\n\n{}\n\n{} | {} | {} | @{} | {}".format(text, user_id, first_name,
                                                                                        last_name, username,
                                                                                        lang_id))
-            logger.debug("Set {}'s state to IDLE!".format(user_id))
             user.set_state(UserState.IDLE)
         else:
             # The user just wrote "/comment" -> Ask him to send a message
@@ -345,9 +343,7 @@ def cancel_cmd(bot, update):
 
 def hide_cmd(bot, update):
     """Hides the keyboard in the specified chat."""
-    chat_id = update.message.chat_id
-    reply_markup = ReplyKeyboardRemove()
-    bot.sendMessage(chat_id=chat_id, text="\U0001F44D", reply_markup=reply_markup)
+    update.message.reply_text("\U0001F44D", reply_markup=ReplyKeyboardRemove())
 
 
 def mentions_cmd(bot, update):
@@ -444,7 +440,7 @@ def restart(bot, update):
 hide_handler = CommandHandler('hide', hide_cmd)
 stats_handler = CommandHandler('stats', stats_cmd)
 language_handler = CommandHandler('language', language_cmd)
-comment_handler = CommandHandler('comment', comment_cmd)
+comment_handler = CommandHandler('comment', comment_cmd, pass_args=True)
 callback_handler = CallbackQueryHandler(callback_eval)
 users_handler = CommandHandler('users', users)
 answer_handler = CommandHandler('answer', answer)

userstate.py

@@ -1,19 +1,23 @@
 # -*- coding: utf-8 -*-
+import logging
 
 
 class UserState(object):
     IDLE = 0
     COMMENTING = 1
     PLAYING = 2
+    state_names = ["IDLE", "COMMENTING", "PLAYING"]
 
     def __init__(self, user_id: int):
+        self.logger = logging.getLogger(__name__)
         self._user_id = user_id
         self._state = UserState.IDLE
 
     def get_state(self) -> int:
         return self._state
 
     def set_state(self, state: int) -> None:
+        self.logger.debug("Set {}'s state to {}!".format(self._user_id, self.state_names[state]))
         self._state = state
 
     def get_userid(self) -> int: