Fixed messages and readability

freqtrade · Feb 11, 2020 · fc29564 · fc29564
1 parent 867b736
commit fc29564
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/docs/webhook-config.md b/docs/webhook-config.md
@@ -16,7 +16,7 @@ Sample configuration (tested using IFTTT).
             "value3": "{stake_amount:8f} {stake_currency}"
         },
         "webhookbuycancel": {
-            "value1": "Cancelling Buy {pair}",
+            "value1": "Cancelling Open Buy Order for {pair}",
             "value2": "limit {limit:8f}",
             "value3": "{stake_amount:8f} {stake_currency}"
         },
@@ -26,7 +26,7 @@ Sample configuration (tested using IFTTT).
             "value3": "profit: {profit_amount:8f} {stake_currency}"
         },
         "webhooksellcancel": {
-            "value1": "Cancelling Sell {pair}",
+            "value1": "Cancelling Open Sell Order for {pair}",
             "value2": "limit {limit:8f}",
             "value3": "profit: {profit_amount:8f} {stake_currency}"
         },

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
@@ -168,8 +168,8 @@ def _rpc_status_table(self, stake_currency: str,
                         profit_str += f" ({fiat_profit:.2f})"
                 trades_list.append([
                     trade.id,
-                    trade.pair + ['', '*'][trade.open_order_id is not None
-                                           and trade.close_rate_requested is None],
+                    trade.pair + '*' if (trade.open_order_id is not None
+                                         and trade.close_rate_requested is None) else '',
                     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
@@ -144,7 +144,7 @@ def send_msg(self, msg: Dict[str, Any]) -> None:
             message += ")`"
 
         elif msg['type'] == RPCMessageType.BUY_CANCEL_NOTIFICATION:
-            message = "*{exchange}:* Cancelling Buy {pair}".format(**msg)
+            message = "*{exchange}:* Cancelling Open Buy Order for {pair}".format(**msg)
 
         elif msg['type'] == RPCMessageType.SELL_NOTIFICATION:
             msg['amount'] = round(msg['amount'], 8)
@@ -172,7 +172,7 @@ def send_msg(self, msg: Dict[str, Any]) -> None:
                             ' / {profit_fiat:.3f} {fiat_currency})`').format(**msg)
 
         elif msg['type'] == RPCMessageType.SELL_CANCEL_NOTIFICATION:
-            message = "*{exchange}:* Cancelling Sell {pair}".format(**msg)
+            message = "*{exchange}:* Cancelling Open Sell Order for {pair}".format(**msg)
 
         elif msg['type'] == RPCMessageType.STATUS_NOTIFICATION:
             message = '*Status:* `{status}`'.format(**msg)

diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py
@@ -1228,7 +1228,7 @@ def test_send_msg_buy_cancel_notification(default_conf, mocker) -> None:
         'pair': 'ETH/BTC',
     })
     assert msg_mock.call_args[0][0] \
-        == ('*Bittrex:* Cancelling Buy ETH/BTC')
+        == ('*Bittrex:* Cancelling Open Buy Order for ETH/BTC')
 
 
 def test_send_msg_sell_notification(default_conf, mocker) -> None:
@@ -1318,7 +1318,7 @@ def test_send_msg_sell_cancel_notification(default_conf, mocker) -> None:
         'pair': 'KEY/ETH',
     })
     assert msg_mock.call_args[0][0] \
-        == ('*Binance:* Cancelling Sell KEY/ETH')
+        == ('*Binance:* Cancelling Open Sell Order for KEY/ETH')
 
     msg_mock.reset_mock()
     telegram.send_msg({
@@ -1327,7 +1327,7 @@ def test_send_msg_sell_cancel_notification(default_conf, mocker) -> None:
         'pair': 'KEY/ETH',
     })
     assert msg_mock.call_args[0][0] \
-        == ('*Binance:* Cancelling Sell KEY/ETH')
+        == ('*Binance:* Cancelling Open Sell Order for KEY/ETH')
     # Reset singleton function to avoid random breaks
     telegram._fiat_converter.convert_amount = old_convamount
 

diff --git a/tests/rpc/test_rpc_webhook.py b/tests/rpc/test_rpc_webhook.py
@@ -21,7 +21,7 @@ def get_webhook_dict() -> dict:
             "value3": "{stake_amount:8f} {stake_currency}"
         },
         "webhookbuycancel": {
-            "value1": "Cancelling Buy {pair}",
+            "value1": "Cancelling Open Buy Order for {pair}",
             "value2": "limit {limit:8f}",
             "value3": "{stake_amount:8f} {stake_currency}"
         },
@@ -31,7 +31,7 @@ def get_webhook_dict() -> dict:
             "value3": "profit: {profit_amount:8f} {stake_currency}"
         },
         "webhooksellcancel": {
-            "value1": "Cancelling Sell {pair}",
+            "value1": "Cancelling Open Sell Order for {pair}",
             "value2": "limit {limit:8f}",
             "value3": "profit: {profit_amount:8f} {stake_currency}"
         },