Skip to content

Commit 42201c8

Browse files
committed
refactor: use ParseMode.HTML provided by ptb
This prevents typos and makes it easy to switch to another parsemode
1 parent 7a482af commit 42201c8

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

blackjackbot/commands/game/commands.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- coding: utf-8 -*-
22

3+
from telegram.parsemode import ParseMode
4+
35
import blackjack.errors as errors
46
from blackjack.game import BlackJackGame
57
from blackjackbot.commands.util import html_mention, get_game_keyboard, get_join_keyboard, get_start_keyboard, remove_inline_keyboard
@@ -156,21 +158,21 @@ def hit_callback(update, context):
156158
game.draw_card()
157159
player_cards = get_cards_string(player, lang_id)
158160
text = translator("your_cards_are").format(user_mention, player.cardvalue, player_cards)
159-
update.effective_message.edit_text(text=text, parse_mode="HTML", reply_markup=get_game_keyboard(game.id, lang_id))
161+
update.effective_message.edit_text(text=text, parse_mode=ParseMode.HTML, reply_markup=get_game_keyboard(game.id, lang_id))
160162
except errors.PlayerBustedException:
161163
player_cards = get_cards_string(player, lang_id)
162164
text = (translator("your_cards_are") + "\n\n" + translator("you_busted")).format(user_mention, player.cardvalue, player_cards)
163-
update.effective_message.edit_text(text=text, parse_mode="HTML", reply_markup=None)
165+
update.effective_message.edit_text(text=text, parse_mode=ParseMode.HTML, reply_markup=None)
164166
next_player(update, context)
165167
except errors.PlayerGot21Exception:
166168
player_cards = get_cards_string(player, lang_id)
167169
if player.has_blackjack():
168170
text = (translator("your_cards_are") + "\n\n" + translator("got_blackjack")).format(user_mention, player.cardvalue, player_cards)
169-
update.effective_message.edit_text(text=text, parse_mode="HTML", reply_markup=None)
171+
update.effective_message.edit_text(text=text, parse_mode=ParseMode.HTML, reply_markup=None)
170172
next_player(update, context)
171173
elif player.cardvalue == 21:
172174
text = (translator("your_cards_are") + "\n\n" + translator("got_21")).format(user_mention, player.cardvalue, player_cards)
173-
update.effective_message.edit_text(text=text, parse_mode="HTML", reply_markup=None)
175+
update.effective_message.edit_text(text=text, parse_mode=ParseMode.HTML, reply_markup=None)
174176
next_player(update, context)
175177

176178

blackjackbot/commands/game/functions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
import logging
33

4-
from telegram import InlineKeyboardButton, InlineKeyboardMarkup
4+
from telegram import InlineKeyboardButton, InlineKeyboardMarkup, ParseMode
55

66
from blackjack.errors import NoPlayersLeftException
77
from blackjack.game import BlackJackGame
@@ -45,15 +45,15 @@ def players_turn(update, context):
4545
# We need reply_text here, because we must send a new message (this is the first message for the player)!
4646
if player.has_blackjack():
4747
text = (translator("your_cards_are") + "\n\n" + translator("got_blackjack")).format(user_mention, player.cardvalue, player_cards)
48-
update.effective_message.reply_text(text=text, parse_mode="HTML", reply_markup=None)
48+
update.effective_message.reply_text(text=text, parse_mode=ParseMode.HTML, reply_markup=None)
4949
next_player(update, context)
5050
elif player.cardvalue == 21:
5151
text = (translator("your_cards_are") + "\n\n" + translator("got_21")).format(user_mention, player.cardvalue, player_cards)
52-
update.effective_message.reply_text(text=text, parse_mode="HTML", reply_markup=None)
52+
update.effective_message.reply_text(text=text, parse_mode=ParseMode.HTML, reply_markup=None)
5353
next_player(update, context)
5454
else:
5555
text = translator("your_cards_are").format(user_mention, player.cardvalue, player_cards)
56-
update.effective_message.reply_text(text=text, parse_mode="HTML", reply_markup=get_game_keyboard(game.id, lang_id))
56+
update.effective_message.reply_text(text=text, parse_mode=ParseMode.HTML, reply_markup=get_game_keyboard(game.id, lang_id))
5757

5858

5959
@needs_active_game
@@ -76,7 +76,7 @@ def next_player(update, context):
7676
# TODO merge messages
7777
update.effective_message.reply_text(translator("dealers_cards_are").format(game.dealer.cardvalue,
7878
get_cards_string(game.dealer, lang_id)),
79-
parse_mode="HTML")
79+
parse_mode=ParseMode.HTML)
8080
evaluation_string = generate_evaluation_string(game, lang_id)
8181

8282
newgame_button = InlineKeyboardButton(text=translator("inline_keyboard_newgame"), callback_data="newgame")

blackjackbot/commands/util/commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
from telegram import ForceReply
3+
from telegram import ForceReply, ParseMode
44

55
from blackjackbot.commands.admin.functions import notify_admins
66
from blackjackbot.lang import translate
@@ -10,7 +10,7 @@
1010

1111

1212
def stats_cmd(update, context):
13-
update.message.reply_text(get_user_stats(update.effective_user.id), parse_mode="HTML")
13+
update.message.reply_text(get_user_stats(update.effective_user.id), parse_mode=ParseMode.HTML)
1414

1515

1616
def comment_cmd(update, context):

0 commit comments

Comments
 (0)