sound_bot: fixes

This commit is contained in:
Evgeny Zinoviev 2022-11-07 00:56:24 +03:00
parent 5f4a14dac4
commit 91aff8bc85
2 changed files with 6 additions and 3 deletions

View File

@ -129,7 +129,10 @@ def callbackhandler(**kwargs):
@wraps(f) @wraps(f)
def _handler(*args, **kwargs): def _handler(*args, **kwargs):
return _handler_of_handler(f=f, *args, **kwargs) return _handler_of_handler(f=f, *args, **kwargs)
_updater.dispatcher.add_handler(CallbackQueryHandler(_handler, pattern=kwargs['callback']), group=0) pattern_kwargs = {}
if kwargs['callback'] != '*':
pattern_kwargs['pattern'] = kwargs['callback']
_updater.dispatcher.add_handler(CallbackQueryHandler(_handler, **pattern_kwargs), group=0)
return _handler return _handler
return inner return inner

View File

@ -90,7 +90,7 @@ def read_sensor(sensor: str, ctx: bot.Context) -> None:
ctx.reply(text, markup=InlineKeyboardMarkup(chunks(buttons, 2))) ctx.reply(text, markup=InlineKeyboardMarkup(chunks(buttons, 2)))
@bot.callbackhandler @bot.callbackhandler(callback='*')
def callback_handler(ctx: bot.Context) -> None: def callback_handler(ctx: bot.Context) -> None:
query = ctx.callback_query query = ctx.callback_query
@ -166,7 +166,7 @@ def draw_plot(data,
@bot.defaultreplymarkup @bot.defaultreplymarkup
def markup(self, ctx: Optional[bot.Context]) -> Optional[ReplyKeyboardMarkup]: def markup(ctx: Optional[bot.Context]) -> Optional[ReplyKeyboardMarkup]:
buttons = [] buttons = []
for k in config['sensors'].keys(): for k in config['sensors'].keys():
buttons.append(ctx.lang(k)) buttons.append(ctx.lang(k))