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

Fix ROYALNET-B6 (Matchmaking not closing games)

Browse source
This commit is contained in:
Steffo 2019-02-21 01:33:10 +01:00
parent 848421a48e
commit c9d614421e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
telegrambot.py
View file

@ -433,13 +433,13 @@ def on_callback_query(bot: telegram.Bot, update: telegram.Update):
text=strings.MATCHMAKING.ERRORS.NOT_ADMIN) text=strings.MATCHMAKING.ERRORS.NOT_ADMIN)
return return
match.closed = True match.closed = True
for player in match.players: for partecipation in match.players:
if int(player.status) >= 1: if int(partecipation.status) >= 1:
try: try:
reply_msg(bot, player.user.telegram_id, strings.MATCHMAKING.GAME_START[int(player.status)], **match.format_dict()) reply_msg(bot, partecipation.user.telegram_id, strings.MATCHMAKING.GAME_START[int(partecipation.status)], **match.format_dict())
except Unauthorized: except Unauthorized:
reply_msg(bot, main_group_id, strings.TELEGRAM.ERRORS.UNAUTHORIZED_USER, reply_msg(bot, main_group_id, strings.TELEGRAM.ERRORS.UNAUTHORIZED_USER,
mention=player.mention()) mention=partecipation.user.mention())
elif update.callback_query.data == "match_cancel": elif update.callback_query.data == "match_cancel":
if not (match.creator == user or user.telegram_id == 25167391): if not (match.creator == user or user.telegram_id == 25167391):
bot.answer_callback_query(update.callback_query.id, bot.answer_callback_query(update.callback_query.id,
@ -461,12 +461,12 @@ def on_callback_query(bot: telegram.Bot, update: telegram.Update):
show_alert=True, show_alert=True,
text=strings.MATCHMAKING.ERRORS.MATCH_CLOSED) text=strings.MATCHMAKING.ERRORS.MATCH_CLOSED)
return return
player = session.query(db.MatchPartecipation).filter_by(match=match, user=user).one_or_none() partecipation = session.query(db.MatchPartecipation).filter_by(match=match, user=user).one_or_none()
if player is None: if partecipation is None:
player = db.MatchPartecipation(match=match, status=status.value, user=user) partecipation = db.MatchPartecipation(match=match, status=status.value, user=user)
session.add(player) session.add(partecipation)
else: else:
player.status = status.value partecipation.status = status.value
session.commit() session.commit()
bot.answer_callback_query(update.callback_query.id, bot.answer_callback_query(update.callback_query.id,
text=strings.MATCHMAKING.TICKER_TEXT[update.callback_query.data], text=strings.MATCHMAKING.TICKER_TEXT[update.callback_query.data],