diff --git a/mybot/__init__.py b/mybot/__init__.py index 791b780..0ff840a 100644 --- a/mybot/__init__.py +++ b/mybot/__init__.py @@ -1,16 +1,24 @@ +from telebot import TeleBot + from .config import Config, load_config from .logger import create_logger -from .bot import get_bot from .i18n import I18N from .database import get_engine from .states import get_state_storage +from .handlers import register_handlers from .middlewares import setup_middlewares from .filters import add_custom_filters -def create_bot(config: Config, i18n: I18N): +def create_bot(config: Config, i18n: I18N, engine): state_storage = get_state_storage(config.states) - bot = get_bot(config.bot, state_storage) + bot = TeleBot(config.bot.token, + parse_mode=config.bot.parse_mode, + skip_pending=config.bot.skip_pending, + num_threads=config.bot.num_threads, + use_class_middlewares=True, + state_storage=state_storage) + register_handlers(bot) setup_middlewares(bot, i18n) add_custom_filters(bot, config) return bot @@ -20,8 +28,8 @@ def main(): config = load_config() # logger = create_logger("mybot", config.log_level) i18n = I18N(config.i18n) - # engine = get_engine(config.database) - bot = create_bot(config, i18n) + engine = get_engine(config.database) + bot = create_bot(config, i18n, engine) bot.infinity_polling( timeout=config.bot.timeout, long_polling_timeout=config.bot.polling_timeout, diff --git a/mybot/bot.py b/mybot/bot.py deleted file mode 100644 index e5c4a65..0000000 --- a/mybot/bot.py +++ /dev/null @@ -1,15 +0,0 @@ -from telebot import TeleBot - -from .handlers import register_handlers -from .config import BotConfig - - -def get_bot(config: BotConfig, state_storage): - bot = TeleBot(config.token, - parse_mode=config.parse_mode, - skip_pending=config.skip_pending, - num_threads=config.num_threads, - use_class_middlewares=True, - state_storage=state_storage) - register_handlers(bot) - return bot