mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Consistently format pair rate between entry and exit messages

Browse Source 
closes #10922
This commit is contained in:
Matthias
2024-11-12 19:03:15 +01:00
parent 98dcc08c6d
commit 88e0fed4c4
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/rpc/telegram.py
+16 -7
View File
@@ -41,7 +41,14 @@ from freqtrade.misc import chunks, plural
from freqtrade.persistence import Trade from freqtrade.persistence import Trade
from freqtrade.rpc import RPC, RPCException, RPCHandler from freqtrade.rpc import RPC, RPCException, RPCHandler
from freqtrade.rpc.rpc_types import RPCEntryMsg, RPCExitMsg, RPCOrderMsg, RPCSendMsg from freqtrade.rpc.rpc_types import RPCEntryMsg, RPCExitMsg, RPCOrderMsg, RPCSendMsg
from freqtrade.util import dt_from_ts, dt_humanize_delta, fmt_coin, format_date, round_value from freqtrade.util import (
dt_from_ts,
dt_humanize_delta,
fmt_coin,
fmt_coin2,
format_date,
round_value,
)
MAX_MESSAGE_LENGTH = MessageLimit.MAX_TEXT_LENGTH MAX_MESSAGE_LENGTH = MessageLimit.MAX_TEXT_LENGTH
@@ -399,10 +406,10 @@ class Telegram(RPCHandler):
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" ({msg['leverage']:.3g}x)" message += f" ({msg['leverage']:.3g}x)"
message += "`\n" message += "`\n"
message += f"*Open Rate:* `{round_value(msg['open_rate'], 8)} {msg['quote_currency']}`\n" message += f"*Open Rate:* `{fmt_coin2(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 += ( message += (
f"*Current Rate:* `{round_value(msg['current_rate'], 8)} {msg['quote_currency']}`\n" f"*Current Rate:* `{fmt_coin2(msg['current_rate'], msg['quote_currency'])}`\n"
) )
profit_fiat_extra = self.__format_profit_fiat(msg, "stake_amount") # type: ignore profit_fiat_extra = self.__format_profit_fiat(msg, "stake_amount") # type: ignore
@@ -467,14 +474,16 @@ class Telegram(RPCHandler):
f"*Direction:* `{msg['direction']}" f"*Direction:* `{msg['direction']}"
f"{leverage_text}`\n" 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_coin2(msg['open_rate'], msg['quote_currency'])}`\n"
) )
if msg["type"] == RPCMessageType.EXIT and msg["current_rate"]: if msg["type"] == RPCMessageType.EXIT and msg["current_rate"]:
message += f"*Current Rate:* `{fmt_coin(msg['current_rate'], msg['quote_currency'])}`\n" message += (
f"*Current Rate:* `{fmt_coin2(msg['current_rate'], msg['quote_currency'])}`\n"
)
if msg["order_rate"]: if msg["order_rate"]:
message += f"*Exit Rate:* `{fmt_coin(msg['order_rate'], msg['quote_currency'])}`" message += f"*Exit Rate:* `{fmt_coin2(msg['order_rate'], msg['quote_currency'])}`"
elif msg["type"] == RPCMessageType.EXIT_FILL: elif msg["type"] == RPCMessageType.EXIT_FILL:
message += f"*Exit Rate:* `{fmt_coin(msg['close_rate'], msg['quote_currency'])}`" message += f"*Exit Rate:* `{fmt_coin2(msg['close_rate'], msg['quote_currency'])}`"
if is_sub_trade: if is_sub_trade:
stake_amount_fiat = self.__format_profit_fiat(msg, "stake_amount") stake_amount_fiat = self.__format_profit_fiat(msg, "stake_amount")