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

avoid using replace in messages

Browse Source
This commit is contained in:
Matthias 2021-11-14 09:19:21 +01:00
parent c4c1b301cd
commit 7c11619924
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
freqtrade/rpc/telegram.py
View File

@ -28,6 +28,7 @@ from freqtrade.misc import chunks, plural, round_coin_value
from freqtrade.persistence import Trade from freqtrade.persistence import Trade
from freqtrade.rpc import RPC, RPCException, RPCHandler from freqtrade.rpc import RPC, RPCException, RPCHandler
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.debug('Included module rpc.telegram ...') logger.debug('Included module rpc.telegram ...')
@ -218,17 +219,20 @@ class Telegram(RPCHandler):
msg['stake_amount'], msg['stake_currency'], msg['fiat_currency']) msg['stake_amount'], msg['stake_currency'], msg['fiat_currency'])
else: else:
msg['stake_amount_fiat'] = 0 msg['stake_amount_fiat'] = 0
is_fill = msg['type'] == RPCMessageType.BUY_FILL
emoji = '\N{CHECK MARK}' if is_fill else '\N{LARGE BLUE CIRCLE}'
message = "\N{CHECK MARK} *{exchange}:* Bought {pair} (#{trade_id})\n".format(**msg) message = (
message += "*Buy Tag:* `{buy_tag}`\n".format(**msg) if msg.get('buy_tag', None) else "" f"{emoji} *{msg['exchange']}:* {'Bought' if is_fill else 'Buying'} {msg['pair']}"
message += "*Amount:* `{amount:.8f}`\n".format(**msg) f" (#{msg['trade_id']})\n"
)
message += f"*Buy Tag:* `{msg['buy_tag']}`\n" if msg.get('buy_tag', None) else ""
message += f"*Amount:* `{msg['amount']:.8f}`\n"
if msg['type'] == RPCMessageType.BUY_FILL: if msg['type'] == RPCMessageType.BUY_FILL:
message += f"*Open Rate:* `{msg['open_rate']:.8f}`\n" message += f"*Open Rate:* `{msg['open_rate']:.8f}`\n"
elif msg['type'] == RPCMessageType.BUY: elif msg['type'] == RPCMessageType.BUY:
message = message.replace('Bought', 'Buying')\
.replace("\N{CHECK MARK}", "\N{LARGE BLUE CIRCLE}")
message += f"*Open Rate:* `{msg['limit']:.8f}`\n"\ message += f"*Open Rate:* `{msg['limit']:.8f}`\n"\
f"*Current Rate:* `{msg['current_rate']:.8f}`\n" f"*Current Rate:* `{msg['current_rate']:.8f}`\n"
@ -256,26 +260,29 @@ class Telegram(RPCHandler):
and self._rpc._fiat_converter): and self._rpc._fiat_converter):
msg['profit_fiat'] = self._rpc._fiat_converter.convert_amount( msg['profit_fiat'] = self._rpc._fiat_converter.convert_amount(
msg['profit_amount'], msg['stake_currency'], msg['fiat_currency']) msg['profit_amount'], msg['stake_currency'], msg['fiat_currency'])
msg['profit_extra'] = (' ({gain}: {profit_amount:.8f} {stake_currency}' msg['profit_extra'] = (
' / {profit_fiat:.3f} {fiat_currency})').format(**msg) f" ({msg['gain']}: {msg['profit_amount']:.8f} {msg['stake_currency']}"
f" / {msg['profit_fiat']:.3f} {msg['fiat_currency']})")
else: else:
msg['profit_extra'] = '' msg['profit_extra'] = ''
is_fill = msg['type'] == RPCMessageType.SELL_FILL
message = ("{emoji} *{exchange}:* Sold {pair} (#{trade_id})\n" message = (
"*Profit:* `{profit_ratio:.2%}{profit_extra}`\n" f"{msg['emoji']} *{msg['exchange']}:* "
"*Buy Tag:* `{buy_tag}`\n" f"{'Sold' if is_fill else 'Selling'} {msg['pair']} (#{msg['trade_id']})\n"
"*Sell Reason:* `{sell_reason}`\n" f"*{'Profit' if is_fill else 'Unrealized Profit'}:* "
"*Duration:* `{duration} ({duration_min:.1f} min)`\n" f"`{msg['profit_ratio']:.2%}{msg['profit_extra']}`\n"
"*Amount:* `{amount:.8f}`\n").format(**msg) f"*Buy Tag:* `{msg['buy_tag']}`\n"
f"*Sell Reason:* `{msg['sell_reason']}`\n"
f"*Duration:* `{msg['duration']} ({msg['duration_min']:.1f} min)`\n"
f"*Amount:* `{msg['amount']:.8f}`\n")
if msg['type'] == RPCMessageType.SELL: if msg['type'] == RPCMessageType.SELL:
message = message.replace('Sold', 'Selling').replace('Profit', 'Unrealized Profit') message += (f"*Open Rate:* `{msg['open_rate']:.8f}`\n"
message += ("*Open Rate:* `{open_rate:.8f}`\n" f"*Current Rate:* `{msg['current_rate']:.8f}`\n"
"*Current Rate:* `{current_rate:.8f}`\n" f"*Close Rate:* `{msg['limit']:.8f}`")
"*Close Rate:* `{limit:.8f}`").format(**msg)
elif msg['type'] == RPCMessageType.SELL_FILL: elif msg['type'] == RPCMessageType.SELL_FILL:
message += ("*Close Rate:* `{close_rate:.8f}`").format(**msg) message += f"*Close Rate:* `{msg['close_rate']:.8f}`"
return message return message