mirror of
https://github.com/freqtrade/freqtrade.git
synced 2025-12-18 22:01:15 +00:00
Merge pull request #9802 from freqtrade/dependabot/pip/develop/python-telegram-bot-20.8
Bump python-telegram-bot from 20.7 to 20.8
This commit is contained in:
@@ -1777,13 +1777,9 @@ class Telegram(RPCHandler):
|
|||||||
msg += f"\nUpdated: {datetime.now().ctime()}"
|
msg += f"\nUpdated: {datetime.now().ctime()}"
|
||||||
if not query.message:
|
if not query.message:
|
||||||
return
|
return
|
||||||
chat_id = query.message.chat_id
|
|
||||||
message_id = query.message.message_id
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await self._app.bot.edit_message_text(
|
await query.edit_message_text(
|
||||||
chat_id=chat_id,
|
|
||||||
message_id=message_id,
|
|
||||||
text=msg,
|
text=msg,
|
||||||
parse_mode=parse_mode,
|
parse_mode=parse_mode,
|
||||||
reply_markup=reply_markup
|
reply_markup=reply_markup
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ ccxt==4.2.42
|
|||||||
cryptography==42.0.2
|
cryptography==42.0.2
|
||||||
aiohttp==3.9.3
|
aiohttp==3.9.3
|
||||||
SQLAlchemy==2.0.25
|
SQLAlchemy==2.0.25
|
||||||
python-telegram-bot==20.7
|
python-telegram-bot==20.8
|
||||||
# can't be hard-pinned due to telegram-bot pinning httpx with ~
|
# can't be hard-pinned due to telegram-bot pinning httpx with ~
|
||||||
httpx>=0.24.1
|
httpx>=0.24.1
|
||||||
arrow==1.3.0
|
arrow==1.3.0
|
||||||
|
|||||||
@@ -2557,22 +2557,22 @@ async def test_telegram__send_msg(default_conf, mocker, caplog) -> None:
|
|||||||
|
|
||||||
# Test update
|
# Test update
|
||||||
query = MagicMock()
|
query = MagicMock()
|
||||||
|
query.edit_message_text = AsyncMock()
|
||||||
await telegram._send_msg('test', callback_path="DeadBeef", query=query, reload_able=True)
|
await telegram._send_msg('test', callback_path="DeadBeef", query=query, reload_able=True)
|
||||||
edit_message_text = telegram._app.bot.edit_message_text
|
assert query.edit_message_text.call_count == 1
|
||||||
assert edit_message_text.call_count == 1
|
assert "Updated: " in query.edit_message_text.call_args_list[0][1]['text']
|
||||||
assert "Updated: " in edit_message_text.call_args_list[0][1]['text']
|
|
||||||
|
|
||||||
telegram._app.bot.edit_message_text = AsyncMock(side_effect=BadRequest("not modified"))
|
query.edit_message_text = AsyncMock(side_effect=BadRequest("not modified"))
|
||||||
await telegram._send_msg('test', callback_path="DeadBeef", query=query)
|
await telegram._send_msg('test', callback_path="DeadBeef", query=query)
|
||||||
assert telegram._app.bot.edit_message_text.call_count == 1
|
assert query.edit_message_text.call_count == 1
|
||||||
assert not log_has_re(r"TelegramError: .*", caplog)
|
assert not log_has_re(r"TelegramError: .*", caplog)
|
||||||
|
|
||||||
telegram._app.bot.edit_message_text = AsyncMock(side_effect=BadRequest(""))
|
query.edit_message_text = AsyncMock(side_effect=BadRequest(""))
|
||||||
await telegram._send_msg('test2', callback_path="DeadBeef", query=query)
|
await telegram._send_msg('test2', callback_path="DeadBeef", query=query)
|
||||||
assert telegram._app.bot.edit_message_text.call_count == 1
|
assert query.edit_message_text.call_count == 1
|
||||||
assert log_has_re(r"TelegramError: .*", caplog)
|
assert log_has_re(r"TelegramError: .*", caplog)
|
||||||
|
|
||||||
telegram._app.bot.edit_message_text = AsyncMock(side_effect=TelegramError("DeadBEEF"))
|
query.edit_message_text = AsyncMock(side_effect=TelegramError("DeadBEEF"))
|
||||||
await telegram._send_msg('test3', callback_path="DeadBeef", query=query)
|
await telegram._send_msg('test3', callback_path="DeadBeef", query=query)
|
||||||
|
|
||||||
assert log_has_re(r"TelegramError: DeadBEEF! Giving up.*", caplog)
|
assert log_has_re(r"TelegramError: DeadBEEF! Giving up.*", caplog)
|
||||||
|
|||||||
Reference in New Issue
Block a user