Merge pull request #1749 from freqtrade/telegram_long_msg
Telegram long /balance message
This commit is contained in:
commit
262113f9ee
@ -20,6 +20,9 @@ logger = logging.getLogger(__name__)
|
|||||||
logger.debug('Included module rpc.telegram ...')
|
logger.debug('Included module rpc.telegram ...')
|
||||||
|
|
||||||
|
|
||||||
|
MAX_TELEGRAM_MESSAGE_LENGTH = 4096
|
||||||
|
|
||||||
|
|
||||||
def authorized_only(command_handler: Callable[..., None]) -> Callable[..., Any]:
|
def authorized_only(command_handler: Callable[..., None]) -> Callable[..., Any]:
|
||||||
"""
|
"""
|
||||||
Decorator to check if the message comes from the correct chat_id
|
Decorator to check if the message comes from the correct chat_id
|
||||||
@ -327,13 +330,20 @@ class Telegram(RPC):
|
|||||||
output = ''
|
output = ''
|
||||||
for currency in result['currencies']:
|
for currency in result['currencies']:
|
||||||
if currency['est_btc'] > 0.0001:
|
if currency['est_btc'] > 0.0001:
|
||||||
output += "*{currency}:*\n" \
|
curr_output = "*{currency}:*\n" \
|
||||||
"\t`Available: {available: .8f}`\n" \
|
"\t`Available: {available: .8f}`\n" \
|
||||||
"\t`Balance: {balance: .8f}`\n" \
|
"\t`Balance: {balance: .8f}`\n" \
|
||||||
"\t`Pending: {pending: .8f}`\n" \
|
"\t`Pending: {pending: .8f}`\n" \
|
||||||
"\t`Est. BTC: {est_btc: .8f}`\n".format(**currency)
|
"\t`Est. BTC: {est_btc: .8f}`\n".format(**currency)
|
||||||
else:
|
else:
|
||||||
output += "*{currency}:* not showing <1$ amount \n".format(**currency)
|
curr_output = "*{currency}:* not showing <1$ amount \n".format(**currency)
|
||||||
|
|
||||||
|
# Handle overflowing messsage length
|
||||||
|
if len(output + curr_output) >= MAX_TELEGRAM_MESSAGE_LENGTH:
|
||||||
|
self._send_msg(output, bot=bot)
|
||||||
|
output = curr_output
|
||||||
|
else:
|
||||||
|
output += curr_output
|
||||||
|
|
||||||
output += "\n*Estimated Value*:\n" \
|
output += "\n*Estimated Value*:\n" \
|
||||||
"\t`BTC: {total: .8f}`\n" \
|
"\t`BTC: {total: .8f}`\n" \
|
||||||
|
@ -4,7 +4,8 @@
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from random import randint
|
from random import choice, randint
|
||||||
|
from string import ascii_uppercase
|
||||||
from unittest.mock import MagicMock, PropertyMock
|
from unittest.mock import MagicMock, PropertyMock
|
||||||
|
|
||||||
import arrow
|
import arrow
|
||||||
@ -20,7 +21,8 @@ from freqtrade.rpc import RPCMessageType
|
|||||||
from freqtrade.rpc.telegram import Telegram, authorized_only
|
from freqtrade.rpc.telegram import Telegram, authorized_only
|
||||||
from freqtrade.state import State
|
from freqtrade.state import State
|
||||||
from freqtrade.strategy.interface import SellType
|
from freqtrade.strategy.interface import SellType
|
||||||
from freqtrade.tests.conftest import (get_patched_freqtradebot, log_has, patch_exchange)
|
from freqtrade.tests.conftest import (get_patched_freqtradebot, log_has,
|
||||||
|
patch_exchange)
|
||||||
from freqtrade.tests.test_freqtradebot import patch_get_signal
|
from freqtrade.tests.test_freqtradebot import patch_get_signal
|
||||||
|
|
||||||
|
|
||||||
@ -587,6 +589,45 @@ def test_balance_handle_empty_response(default_conf, update, mocker) -> None:
|
|||||||
assert 'all balances are zero' in result
|
assert 'all balances are zero' in result
|
||||||
|
|
||||||
|
|
||||||
|
def test_balance_handle_too_large_response(default_conf, update, mocker) -> None:
|
||||||
|
balances = []
|
||||||
|
for i in range(100):
|
||||||
|
curr = choice(ascii_uppercase) + choice(ascii_uppercase) + choice(ascii_uppercase)
|
||||||
|
balances.append({
|
||||||
|
'currency': curr,
|
||||||
|
'available': 1.0,
|
||||||
|
'pending': 0.5,
|
||||||
|
'balance': i,
|
||||||
|
'est_btc': 1
|
||||||
|
})
|
||||||
|
mocker.patch('freqtrade.rpc.rpc.RPC._rpc_balance', return_value={
|
||||||
|
'currencies': balances,
|
||||||
|
'total': 100.0,
|
||||||
|
'symbol': 100.0,
|
||||||
|
'value': 1000.0,
|
||||||
|
})
|
||||||
|
|
||||||
|
msg_mock = MagicMock()
|
||||||
|
mocker.patch.multiple(
|
||||||
|
'freqtrade.rpc.telegram.Telegram',
|
||||||
|
_init=MagicMock(),
|
||||||
|
_send_msg=msg_mock
|
||||||
|
)
|
||||||
|
|
||||||
|
freqtradebot = get_patched_freqtradebot(mocker, default_conf)
|
||||||
|
patch_get_signal(freqtradebot, (True, False))
|
||||||
|
|
||||||
|
telegram = Telegram(freqtradebot)
|
||||||
|
|
||||||
|
telegram._balance(bot=MagicMock(), update=update)
|
||||||
|
assert msg_mock.call_count > 1
|
||||||
|
# Test if wrap happens around 4000 -
|
||||||
|
# and each single currency-output is around 120 characters long so we need
|
||||||
|
# an offset to avoid random test failures
|
||||||
|
assert len(msg_mock.call_args_list[0][0][0]) < 4096
|
||||||
|
assert len(msg_mock.call_args_list[0][0][0]) > (4096 - 120)
|
||||||
|
|
||||||
|
|
||||||
def test_start_handle(default_conf, update, mocker) -> None:
|
def test_start_handle(default_conf, update, mocker) -> None:
|
||||||
msg_mock = MagicMock()
|
msg_mock = MagicMock()
|
||||||
mocker.patch.multiple(
|
mocker.patch.multiple(
|
||||||
|
Loading…
Reference in New Issue
Block a user