From 1d40162e9d1660a73d945a4bf7a30b48cc70ede4 Mon Sep 17 00:00:00 2001 From: Bohdan Kamuz Date: Sat, 15 Apr 2023 15:57:31 +0000 Subject: [PATCH 1/3] Telegram. Fixed the blacklist removal message. --- freqtrade/rpc/telegram.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 51f7fb9ee..92d2c13a5 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -1413,12 +1413,12 @@ class Telegram(RPCHandler): Handler for /blacklist Shows the currently active blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args)) + self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args), ['adding', 'to']) - def send_blacklist_msg(self, blacklist: Dict): + def send_blacklist_msg(self, blacklist: Dict, action): errmsgs = [] for pair, error in blacklist['errors'].items(): - errmsgs.append(f"Error adding `{pair}` to blacklist: `{error['error_msg']}`") + errmsgs.append(f"Error {action[0]} `{pair}` {action[1]} blacklist: `{error['error_msg']}`") if errmsgs: self._send_msg('\n'.join(errmsgs)) @@ -1434,7 +1434,7 @@ class Telegram(RPCHandler): Handler for /bl_delete Deletes pair(s) from current blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or [])) + self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or []), ['deleting', 'from']) @authorized_only def _logs(self, update: Update, context: CallbackContext) -> None: From d34b15d6a9c4202b7b5ed2368abfa004561ef959 Mon Sep 17 00:00:00 2001 From: Bohdan Kamuz Date: Mon, 17 Apr 2023 09:40:41 +0000 Subject: [PATCH 2/3] Telegram. Fixed the blacklist removal message --- freqtrade/rpc/telegram.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 92d2c13a5..a26841e14 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -1413,12 +1413,13 @@ class Telegram(RPCHandler): Handler for /blacklist Shows the currently active blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args), ['adding', 'to']) + self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args), 1) - def send_blacklist_msg(self, blacklist: Dict, action): + def send_blacklist_msg(self, blacklist: Dict, des): errmsgs = [] + act = ['adding', 'to'] if des == 1 else ['deleting', 'from'] for pair, error in blacklist['errors'].items(): - errmsgs.append(f"Error {action[0]} `{pair}` {action[1]} blacklist: `{error['error_msg']}`") + errmsgs.append(f"Error {act[0]} `{pair}` {act[1]} blacklist: `{error['error_msg']}`") if errmsgs: self._send_msg('\n'.join(errmsgs)) @@ -1434,7 +1435,7 @@ class Telegram(RPCHandler): Handler for /bl_delete Deletes pair(s) from current blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or []), ['deleting', 'from']) + self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or []), 0) @authorized_only def _logs(self, update: Update, context: CallbackContext) -> None: From c297d999750ada0e7c01f8b10b1d6fae65a20084 Mon Sep 17 00:00:00 2001 From: Bohdan Kamuz Date: Tue, 18 Apr 2023 10:09:48 +0000 Subject: [PATCH 3/3] Telegram. Fixed the blacklist removal message --- freqtrade/rpc/telegram.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index a26841e14..e626ee598 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -1413,13 +1413,12 @@ class Telegram(RPCHandler): Handler for /blacklist Shows the currently active blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args), 1) + self.send_blacklist_msg(self._rpc._rpc_blacklist(context.args)) - def send_blacklist_msg(self, blacklist: Dict, des): + def send_blacklist_msg(self, blacklist: Dict): errmsgs = [] - act = ['adding', 'to'] if des == 1 else ['deleting', 'from'] for pair, error in blacklist['errors'].items(): - errmsgs.append(f"Error {act[0]} `{pair}` {act[1]} blacklist: `{error['error_msg']}`") + errmsgs.append(f"Error: {error['error_msg']}") if errmsgs: self._send_msg('\n'.join(errmsgs)) @@ -1435,7 +1434,7 @@ class Telegram(RPCHandler): Handler for /bl_delete Deletes pair(s) from current blacklist """ - self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or []), 0) + self.send_blacklist_msg(self._rpc._rpc_blacklist_delete(context.args or [])) @authorized_only def _logs(self, update: Update, context: CallbackContext) -> None: