lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 10:21:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Improve exit message wording

Browse Source
This commit is contained in:
Matthias 2024-01-06 11:30:45 +01:00
parent 59ec3fd860
commit 2a11597ad3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freqtrade/rpc/telegram.py
View File

@ -360,7 +360,7 @@ class Telegram(RPCHandler):
is_sub_trade = msg.get('sub_trade') is_sub_trade = msg.get('sub_trade')
is_sub_profit = msg['profit_amount'] != msg.get('cumulative_profit') is_sub_profit = msg['profit_amount'] != msg.get('cumulative_profit')
is_final_exit = msg.get('is_final_exit', False) and is_sub_profit is_final_exit = msg.get('is_final_exit', False) and is_sub_profit
profit_prefix = ('Sub ' if is_sub_profit else 'Cumulative ') if is_sub_trade else '' profit_prefix = 'Sub ' if is_sub_trade else ''
cp_extra = '' cp_extra = ''
exit_wording = 'Exited' if is_fill else 'Exiting' exit_wording = 'Exited' if is_fill else 'Exiting'
if is_sub_trade or is_final_exit: if is_sub_trade or is_final_exit:
@ -374,11 +374,12 @@ class Telegram(RPCHandler):
) )
else: else:
exit_wording = f"Partially {exit_wording.lower()}" exit_wording = f"Partially {exit_wording.lower()}"
cp_extra = ( if msg['cumulative_profit']:
f"*Cumulative Profit:* `({msg['cumulative_profit']:.8f} " cp_extra = (
f"{msg['stake_currency']}{cp_fiat})`\n" f"*Cumulative Profit:* `({msg['cumulative_profit']:.8f} "
) f"{msg['stake_currency']}{cp_fiat})`\n"
)
enter_tag = f"*Enter Tag:* `{msg['enter_tag']}`\n" if msg.get('enter_tag') else ""
message = ( message = (
f"{self._get_sell_emoji(msg)} *{self._exchange_from_msg(msg)}:* " f"{self._get_sell_emoji(msg)} *{self._exchange_from_msg(msg)}:* "
f"{exit_wording} {msg['pair']} (#{msg['trade_id']})\n" f"{exit_wording} {msg['pair']} (#{msg['trade_id']})\n"
@ -386,7 +387,7 @@ class Telegram(RPCHandler):
f"*{f'{profit_prefix}Profit' if is_fill else f'Unrealized {profit_prefix}Profit'}:* " f"*{f'{profit_prefix}Profit' if is_fill else f'Unrealized {profit_prefix}Profit'}:* "
f"`{msg['profit_ratio']:.2%}{profit_extra}`\n" f"`{msg['profit_ratio']:.2%}{profit_extra}`\n"
f"{cp_extra}" f"{cp_extra}"
f"*Enter Tag:* `{msg['enter_tag']}`\n" f"{enter_tag}"
f"*Exit Reason:* `{msg['exit_reason']}`\n" f"*Exit Reason:* `{msg['exit_reason']}`\n"
f"*Direction:* `{msg['direction']}`\n" f"*Direction:* `{msg['direction']}`\n"
f"{leverage_text}" f"{leverage_text}"