diff --git a/docs/telegram-usage.md b/docs/telegram-usage.md index c7f9c58f6..3cd6fa03f 100644 --- a/docs/telegram-usage.md +++ b/docs/telegram-usage.md @@ -216,11 +216,14 @@ Once all positions are sold, run `/stop` to completely stop the bot. ### /status For each open trade, the bot will send you the following message. +Enter Tag is configurable via Strategy. > **Trade ID:** `123` `(since 1 days ago)` > **Current Pair:** CVC/BTC -> **Open Since:** `1 days ago` +> **Direction:** Long +> **Leverage:** 1.0 > **Amount:** `26.64180098` +> **Enter Tag:** Awesome Long Signal > **Open Rate:** `0.00007489` > **Current Rate:** `0.00007489` > **Current Profit:** `12.95%` @@ -233,8 +236,8 @@ Return the status of all open trades in a table format. ``` ID Pair Since Profit ---- -------- ------- -------- - 67 SC/BTC 1 d 13.33% - 123 CVC/BTC 1 h 12.95% + 67 SC/BTC L 1 d 13.33% + 123 CVC/BTC S 1 h 12.95% ``` ### /count diff --git a/docs/webhook-config.md b/docs/webhook-config.md index 6ee01a615..af684d449 100644 --- a/docs/webhook-config.md +++ b/docs/webhook-config.md @@ -104,6 +104,8 @@ Possible parameters are: * `trade_id` * `exchange` * `pair` +* `is_short` +* `leverage` * ~~`limit` # Deprecated - should no longer be used.~~ * `open_rate` * `amount` @@ -141,6 +143,8 @@ Possible parameters are: * `trade_id` * `exchange` * `pair` +* `is_short` +* `leverage` * `open_rate` * `amount` * `open_date` @@ -152,13 +156,15 @@ Possible parameters are: * `enter_tag` ### Webhooksell - +# TODO-lev add support for long and short? The fields in `webhook.webhooksell` are filled when the bot sells a trade. Parameters are filled using string.format. Possible parameters are: * `trade_id` * `exchange` * `pair` +* `is_short` +* `leverage` * `gain` * `limit` * `amount` diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index f11243208..2c12e75a6 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -233,6 +233,7 @@ class RPC: current_rate = NAN trade_profit = trade.calc_profit(current_rate) profit_str = f'{trade.calc_profit_ratio(current_rate):.2%}' + direction_str = 'S' if trade.is_short else 'L' if self._fiat_converter: fiat_profit = self._fiat_converter.convert_amount( trade_profit, @@ -247,7 +248,8 @@ class RPC: trade.id, trade.pair + ('*' if (trade.open_order_id is not None and trade.close_rate_requested is None) else '') - + ('**' if (trade.close_rate_requested is not None) else ''), + + ('**' if (trade.close_rate_requested is not None) else '') + + f' direction_str', shorten_date(arrow.get(trade.open_date).humanize(only_distance=True)), profit_str ]) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index b394fad11..afb0a1c8e 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -398,6 +398,8 @@ class Telegram(RPCHandler): lines = [ "*Trade ID:* `{trade_id}` `(since {open_date_hum})`", "*Current Pair:* {pair}", + "*Direction:* " + ("`Short`" if r['is_short'] else "`Long`"), + "*Leverage:* `{leverage}`" if r['leverage'] else "", "*Amount:* `{amount} ({stake_amount} {base_currency})`", "*Enter Tag:* `{enter_tag}`" if r['enter_tag'] else "", "*Open Rate:* `{open_rate:.8f}`",