Jerry/mau_mau_bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2 from imlonghao/patch

Browse source 
Fix issue when joining a closed game, send message via send_async, se…
This commit is contained in:
Jannes Höke 2016-04-27 16:12:50 +02:00
commit 9487fdf7f6
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bot.py
View file

@ -115,9 +115,9 @@ def new_game(bot, update):
help(bot, update) help(bot, update)
else: else:
gm.new_game(update.message.chat) gm.new_game(update.message.chat)
bot.sendMessage(chat_id, send_async(bot, chat_id,
text="Created a new game! Join the game with /join " text="Created a new game! Join the game with /join "
"and start the game with /start") "and start the game with /start")
if botan: if botan:
botan.track(update.message, 'New games') botan.track(update.message, 'New games')
@ -132,6 +132,7 @@ def join_game(bot, update):
game = gm.chatid_games[chat_id][-1] game = gm.chatid_games[chat_id][-1]
if not game.open: if not game.open:
send_async(bot, chat_id, text="The lobby is closed") send_async(bot, chat_id, text="The lobby is closed")
return
except (KeyError, IndexError): except (KeyError, IndexError):
pass pass
@ -163,7 +164,8 @@ def leave_game(bot, update):
break break
else: else:
send_async(bot, chat_id, text="You are not playing in a game in " send_async(bot, chat_id, text="You are not playing in a game in "
"this group.") "this group.",
reply_to_message_id=update.message.message_id)
return return
user = update.message.from_user user = update.message.from_user
@ -173,10 +175,12 @@ def leave_game(bot, update):
send_async(bot, chat_id, text="Game ended!") send_async(bot, chat_id, text="Game ended!")
else: else:
if gm.leave_game(user, chat_id): if gm.leave_game(user, chat_id):
send_async(bot, chat_id, text="Okay") send_async(bot, chat_id, text="Okay",
reply_to_message_id=update.message.message_id)
else: else:
send_async(bot, chat_id, text="You are not playing in a game in " send_async(bot, chat_id, text="You are not playing in a game in "
"this group.") "this group.",
reply_to_message_id=update.message.message_id)
def select_game(bot, update): def select_game(bot, update):
@ -281,7 +285,8 @@ def close_game(bot, update):
send_async(bot, chat_id, text="Closed the lobby") send_async(bot, chat_id, text="Closed the lobby")
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that") text="Only the game creator can do that",
reply_to_message_id=update.message.message_id)
def open_game(bot, update): def open_game(bot, update):
@ -299,7 +304,8 @@ def open_game(bot, update):
send_async(bot, chat_id, text="Opened the lobby") send_async(bot, chat_id, text="Opened the lobby")
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that") text="Only the game creator can do that",
reply_to_message_id=update.message.message_id)
def skip_player(bot, update): def skip_player(bot, update):
@ -320,7 +326,8 @@ def skip_player(bot, update):
% display_name(game.current_player.user)) % display_name(game.current_player.user))
else: else:
send_async(bot, chat_id, send_async(bot, chat_id,
text="Only the game creator can do that") text="Only the game creator can do that",
reply_to_message_id=update.message.message_id)
def help(bot, update): def help(bot, update):