adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve formatting of telegram message

Browse Source
This commit is contained in:
Matthias 2020-08-04 19:56:49 +02:00
parent 817f5289db
commit 075c73b9e3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/rpc/rpc.py
View File

@ -6,7 +6,7 @@ from abc import abstractmethod
from datetime import date, datetime, timedelta from datetime import date, datetime, timedelta
from enum import Enum from enum import Enum
from math import isnan from math import isnan
from typing import Any, Dict, List, Optional, Tuple from typing import Any, Dict, List, Optional, Tuple, Union
import arrow import arrow
from numpy import NAN, mean from numpy import NAN, mean
@ -538,7 +538,7 @@ class RPC:
else: else:
return None return None
def _rpc_delete(self, trade_id: str) -> Dict[str, str]: def _rpc_delete(self, trade_id: str) -> Dict[str, Union[str, int]]:
""" """
Handler for delete <id>. Handler for delete <id>.
Delete the given trade and close eventually existing open orders. Delete the given trade and close eventually existing open orders.

5
freqtrade/rpc/telegram.py
View File

@ -547,7 +547,10 @@ class Telegram(RPC):
trade_id = context.args[0] if len(context.args) > 0 else None trade_id = context.args[0] if len(context.args) > 0 else None
try: try:
msg = self._rpc_delete(trade_id) msg = self._rpc_delete(trade_id)
self._send_msg('Delete Result: `{result_msg}`'.format(**msg)) self._send_msg((
'Delete Result: `{result_msg}`'
'Please make sure to take care of this asset on the exchange manually.'
).format(**msg))
except RPCException as e: except RPCException as e:
self._send_msg(str(e)) self._send_msg(str(e))

2
tests/rpc/test_rpc_telegram.py
View File

@ -1200,8 +1200,8 @@ def test_telegram_delete_trade(mocker, update, default_conf, fee):
context.args = [1] context.args = [1]
telegram._delete_trade(update=update, context=context) telegram._delete_trade(update=update, context=context)
msg_mock.call_count == 1 msg_mock.call_count == 1
assert "Delete Result" in msg_mock.call_args_list[0][0][0]
assert "Deleted trade 1." in msg_mock.call_args_list[0][0][0] assert "Deleted trade 1." in msg_mock.call_args_list[0][0][0]
assert "Please make sure to take care of this asset" in msg_mock.call_args_list[0][0][0]
def test_help_handle(default_conf, update, mocker) -> None: def test_help_handle(default_conf, update, mocker) -> None: