ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

:o

Browse source
This commit is contained in:
Steffo 2019-01-25 15:38:00 +01:00
parent 13b91d0a39
commit 048c29b2f7
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
telegrambot.py
View file

@ -346,8 +346,7 @@ def on_callback_query(bot: Bot, update: Update):
user = session.query(db.Telegram).filter_by(telegram_id=update.callback_query.from_user.id).one_or_none() user = session.query(db.Telegram).filter_by(telegram_id=update.callback_query.from_user.id).one_or_none()
if user is None: if user is None:
bot.answer_callback_query(update.callback_query.id, show_alert=True, bot.answer_callback_query(update.callback_query.id, show_alert=True,
text="⚠ Il tuo account Telegram non è registrato a Royalnet!" text=strings.ROYALNET.ERRORS.TELEGRAM_NOT_LINKED,
" Registrati con `/register@royalgamesbot <nomeutenteryg>`.",
parse_mode="Markdown") parse_mode="Markdown")
return return
question = session.query(db.VoteQuestion)\ question = session.query(db.VoteQuestion)\
@ -391,7 +390,6 @@ def on_callback_query(bot: Bot, update: Update):
return return
match = session.query(db.Match).filter_by(message_id=update.callback_query.message.message_id).one() match = session.query(db.Match).filter_by(message_id=update.callback_query.message.message_id).one()
if update.callback_query.data == "match_close": if update.callback_query.data == "match_close":
status = None
if match.creator != user: if match.creator != user:
bot.answer_callback_query(update.callback_query.id, bot.answer_callback_query(update.callback_query.id,
show_alert=True, show_alert=True,
@ -403,8 +401,22 @@ def on_callback_query(bot: Bot, update: Update):
bot.send_message(player.user.telegram_id, bot.send_message(player.user.telegram_id,
s(strings.MATCHMAKING.GAME_START[player.status], s(strings.MATCHMAKING.GAME_START[player.status],
**match.format_dict())) **match.format_dict()))
else: elif update.callback_query.data == "match_cancel":
raise NotImplementedError() if match.creator != user:
bot.answer_callback_query(update.callback_query.id,
show_alert=True,
text=strings.MATCHMAKING.ERRORS.NOT_ADMIN)
return
match.closed = True
status = {
"match_ready": db.MatchmakingStatus.READY,
"match_wait_for_me": db.MatchmakingStatus.WAIT_FOR_ME,
"match_someone_else": db.MatchmakingStatus.SOMEONE_ELSE,
"match_maybe": db.MatchmakingStatus.MAYBE,
"match_ignore": db.MatchmakingStatus.IGNORED,
"match_close": None,
"match_cancel": None,
}.get(update.callback_query.data)
if status: if status:
if match.closed: if match.closed:
bot.answer_callback_query(update.callback_query.id, bot.answer_callback_query(update.callback_query.id,