Try to add markup

This commit is contained in:
Ilya Bezrukov 2024-07-31 00:44:19 +03:00
parent a8f39d4630
commit d3ed6e4006
7 changed files with 106 additions and 9 deletions

View File

@ -8,6 +8,7 @@ from .states import get_state_storage
from .handlers import register_handlers
from .middlewares import setup_middlewares
from .filters import add_custom_filters
from .markup import setup_markup
from .webhook import create_app
@ -21,7 +22,8 @@ def create_bot(config: Config, i18n: I18N, engine):
state_storage=state_storage,
threaded=False if config.use_webhook else True)
register_handlers(bot)
setup_middlewares(bot, i18n, engine)
markup = setup_markup(bot, i18n)
setup_middlewares(bot, i18n, engine, markup)
add_custom_filters(bot, config)
bot.delete_webhook()
if config.use_webhook:

View File

@ -1,9 +1,13 @@
from telebot import TeleBot
from telebot.types import Message
from telebot.types import Message, CallbackQuery
def start(message: Message, bot: TeleBot, t, **kwargs):
bot.send_message(message.chat.id, t("start"))
def start(message: Message, bot: TeleBot, t, m, **kwargs):
bot.send_message(message.chat.id, t("start"), reply_markup=m("start"))
def start_call(call: CallbackQuery, bot: TeleBot, t, m, **kwargs):
bot.send_message(call.message.chat.id, t("start"), reply_markup=m("start"))
def help_(message, bot, t, **kwargs):
@ -13,3 +17,5 @@ def help_(message, bot, t, **kwargs):
def register_handlers(bot: TeleBot):
bot.register_message_handler(start, commands=["start"], pass_bot=True)
bot.register_message_handler(help_, commands=["help"], pass_bot=True)
bot.register_callback_query_handler(start_call, lambda call: call.data == "start")

11
mybot/markup/__init__.py Normal file
View File

@ -0,0 +1,11 @@
from telebot import TeleBot
from ..i18n import I18N
from .base import MarkupManager
from .simple import SimpleMarkup
def setup_markup(bot: TeleBot, i18n: I18N):
markup_mg = MarkupManager(bot, i18n)
markup_mg.register_prototype(SimpleMarkup)
return markup_mg

55
mybot/markup/base.py Normal file
View File

@ -0,0 +1,55 @@
import abc
from typing import Optional, Type
from telebot import TeleBot
from telebot.types import CallbackQuery, InlineKeyboardMarkup
from ..i18n import I18N
class Markup (metaclass=abc.ABCMeta):
tag: str
def __init__(self, bot: TeleBot, i18n: I18N):
self.bot = bot
self.t = i18n
def __call__(self, *args, **kwargs):
return self.build(*args, **kwargs)
def check(self, call: CallbackQuery) -> bool:
return call.data == self.tag
@abc.abstractmethod
def build(self, *args, **kwargs) -> Optional[InlineKeyboardMarkup]:
pass
class DummyMarkup (Markup):
tag = "__dummy"
def check(self, call: CallbackQuery) -> bool:
return True
def build(self, *args, **kwargs) -> Optional[InlineKeyboardMarkup]:
return None
class MarkupManager:
def __init__(self, bot: TeleBot, i18n: I18N):
self.bot = bot
self.i18n = i18n
self._prototypes: list[Markup] = []
self._dummy = DummyMarkup(self.bot, self.i18n)
def register_prototype(self, markup_proto_class: Type[Markup]):
self._prototypes.append(markup_proto_class(self.bot, self.i18n))
def __call__(self, tag: str, *args, **kwargs):
return self.get(tag).build(*args, **kwargs)
def get(self, tag: str) -> Optional[Markup]:
for mp in self._prototypes:
if mp.tag == tag:
return mp
return None

15
mybot/markup/simple.py Normal file
View File

@ -0,0 +1,15 @@
from typing import Optional
from telebot.types import InlineKeyboardMarkup, InlineKeyboardButton
from .base import Markup
class SimpleMarkup (Markup):
tag = "start"
def build(self, *args, **kwargs) -> Optional[InlineKeyboardMarkup]:
return (InlineKeyboardMarkup()
.add(InlineKeyboardButton("start", callback_data="start"))
.add(InlineKeyboardButton("help", callback_data="help"))
)

View File

@ -5,6 +5,6 @@ from .arguments import ArgumentsMiddleware
from .database import DatabaseMiddleware
def setup_middlewares(bot: TeleBot, i18n: I18N, engine):
bot.setup_middleware(ArgumentsMiddleware(i18n))
def setup_middlewares(bot: TeleBot, i18n: I18N, engine, markup):
bot.setup_middleware(ArgumentsMiddleware(i18n, markup))
bot.setup_middleware(DatabaseMiddleware(engine))

View File

@ -3,16 +3,24 @@ from telebot.types import Message, CallbackQuery
class ArgumentsMiddleware (BaseMiddleware):
def __init__(self, i18n):
def __init__(self, i18n, markup):
super().__init__()
self.i18n = i18n
self.markup = markup
self.update_types = ["message", "callback_query"]
def pre_process(self, obj, data: dict):
if isinstance(obj, Message):
data["t"] = self.i18n.customized_call(message=obj)
self.pre_process_message(obj, data)
elif isinstance(obj, CallbackQuery):
data["t"] = self.i18n.customized_call(callback=obj)
self.pre_process_callback(obj, data)
data["m"] = self.markup
def pre_process_message(self, message: Message, data: dict):
data["t"] = self.i18n.customized_call(message=message)
def pre_process_callback(self, call: CallbackQuery, data: dict):
data["t"] = self.i18n.customized_call(callback=call)
def post_process(self, message, data: dict, exception: BaseException):
pass