adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exception for invalid keyboard config

Browse Source
This commit is contained in:
Christof 2020-12-22 12:34:21 +01:00
parent 4dadfd199d
commit be28b42bfa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freqtrade/rpc/telegram.py
View File

@ -17,6 +17,7 @@ from telegram.ext import CallbackContext, CommandHandler, Updater
from telegram.utils.helpers import escape_markdown from telegram.utils.helpers import escape_markdown
from freqtrade.__init__ import __version__ from freqtrade.__init__ import __version__
from freqtrade.exceptions import OperationalException
from freqtrade.rpc import RPC, RPCException, RPCMessageType from freqtrade.rpc import RPC, RPCException, RPCMessageType
from freqtrade.rpc.fiat_convert import CryptoToFiatConverter from freqtrade.rpc.fiat_convert import CryptoToFiatConverter
@ -75,12 +76,12 @@ class Telegram(RPC):
self._updater: Updater self._updater: Updater
self._config = freqtrade.config self._config = freqtrade.config
self._validate_keyboard() self._init_keyboard()
self._init() self._init()
if self._config.get('fiat_display_currency', None): if self._config.get('fiat_display_currency', None):
self._fiat_converter = CryptoToFiatConverter() self._fiat_converter = CryptoToFiatConverter()
def _validate_keyboard(self) -> None: def _init_keyboard(self) -> None:
""" """
Validates the keyboard configuration from telegram config Validates the keyboard configuration from telegram config
section. section.
@ -102,19 +103,19 @@ class Telegram(RPC):
'/logs', '/whitelist', '/blacklist', '/edge', '/logs', '/whitelist', '/blacklist', '/edge',
'/help', '/version'] '/help', '/version']
# custom shortcuts specified in config.json # custom keyboard specified in config.json
cust_keyboard = self._config['telegram'].get('keyboard', []) cust_keyboard = self._config['telegram'].get('keyboard', [])
if cust_keyboard: if cust_keyboard:
# check for valid shortcuts # check for valid shortcuts
invalid_keys = [b for b in chain.from_iterable(cust_keyboard) invalid_keys = [b for b in chain.from_iterable(cust_keyboard)
if b not in valid_keys] if b not in valid_keys]
if len(invalid_keys): if len(invalid_keys):
logger.warning('rpc.telegram: invalid commands for custom ' err_msg = ('invalid commands for custom keyboard: '
f'keyboard: {invalid_keys}') f'{invalid_keys}')
logger.info('rpc.telegram: using default keyboard.') raise OperationalException(err_msg)
else: else:
self._keyboard = cust_keyboard self._keyboard = cust_keyboard
logger.info('rpc.telegram using custom keyboard from ' logger.info('using custom keyboard from '
f'config.json: {self._keyboard}') f'config.json: {self._keyboard}')
def _init(self) -> None: def _init(self) -> None: