CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-19 06:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve entry message

Browse Source
This commit is contained in:
Matthias
2024-01-07 14:30:27 +01:00
parent b27f99dbc3
commit 28b5552231
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
freqtrade/rpc/telegram.py
View File

@@ -333,19 +333,28 @@ class Telegram(RPCHandler):
is_fill = msg['type'] in [RPCMessageType.ENTRY_FILL] is_fill = msg['type'] in [RPCMessageType.ENTRY_FILL]
emoji = '\N{CHECK MARK}' if is_fill else '\N{LARGE BLUE CIRCLE}' emoji = '\N{CHECK MARK}' if is_fill else '\N{LARGE BLUE CIRCLE}'
entry_side = ({'enter': 'Long', 'entered': 'Longed'} if msg['direction'] == 'Long' terminology = {
else {'enter': 'Short', 'entered': 'Shorted'}) '1_enter': 'New Trade',
'1_entered': 'New Trade filled',
'x_enter': 'Increasing position',
'x_entered': 'Position increase filled',
}
key = f"{'x' if msg['sub_trade'] else '1'}_{'entered' if is_fill else 'enter'}"
wording = terminology[key]
message = ( message = (
f"{emoji} *{self._exchange_from_msg(msg)}:*" f"{emoji} *{self._exchange_from_msg(msg)}:*"
f" {entry_side['entered'] if is_fill else entry_side['enter']} {msg['pair']}" f" {wording} (#{msg['trade_id']})\n"
f" (#{msg['trade_id']})\n" f"*Pair:* `{msg['pair']}`\n"
) )
message += self._add_analyzed_candle(msg['pair']) message += self._add_analyzed_candle(msg['pair'])
message += f"*Enter Tag:* `{msg['enter_tag']}`\n" if msg.get('enter_tag') else "" message += f"*Enter Tag:* `{msg['enter_tag']}`\n" if msg.get('enter_tag') else ""
message += f"*Amount:* `{round_value(msg['amount'], 8)}`\n" message += f"*Amount:* `{round_value(msg['amount'], 8)}`\n"
message += f"*Direction:* `{msg['direction']}"
if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0: if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0:
message += f"*Leverage:* `{msg['leverage']:.1g}`\n" message += f" ({msg['leverage']:.1g}x)"
message += "`\n"
message += f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n" message += f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n"
if msg['type'] == RPCMessageType.ENTRY and msg['current_rate']: if msg['type'] == RPCMessageType.ENTRY and msg['current_rate']:
message += f"*Current Rate:* `{fmt_coin(msg['current_rate'], msg['quote_currency'])}`\n" message += f"*Current Rate:* `{fmt_coin(msg['current_rate'], msg['quote_currency'])}`\n"
@@ -353,7 +362,7 @@ class Telegram(RPCHandler):
profit_fiat_extra = self.__format_profit_fiat(msg, 'stake_amount') # type: ignore profit_fiat_extra = self.__format_profit_fiat(msg, 'stake_amount') # type: ignore
total = fmt_coin(msg['stake_amount'], msg['quote_currency']) total = fmt_coin(msg['stake_amount'], msg['quote_currency'])
message += f"*Total:* `{total}{profit_fiat_extra}`" message += f"*{'New ' if msg['sub_trade'] else ''}Total:* `{total}{profit_fiat_extra}`"
return message return message
@@ -362,7 +371,7 @@ class Telegram(RPCHandler):
microsecond=0) - msg['open_date'].replace(microsecond=0) microsecond=0) - msg['open_date'].replace(microsecond=0)
duration_min = duration.total_seconds() / 60 duration_min = duration.total_seconds() / 60
leverage_text = (f"*Leverage:* `{msg['leverage']:.1g}`\n" leverage_text = (f" ({msg['leverage']:.1g}x)"
if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0 if msg.get('leverage') and msg.get('leverage', 1.0) != 1.0
else "") else "")
@@ -405,8 +414,9 @@ class Telegram(RPCHandler):
f"{cp_extra}" f"{cp_extra}"
f"{enter_tag}" 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']}"
f"{leverage_text}" f"{leverage_text}"
"`\n"
f"*Amount:* `{round_value(msg['amount'], 8)}`\n" f"*Amount:* `{round_value(msg['amount'], 8)}`\n"
f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n" f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n"
) )