diff --git a/db/create.py b/db/create.py index b3b6ec6..3c0fe06 100644 --- a/db/create.py +++ b/db/create.py @@ -76,4 +76,4 @@ def create_tables_if_not_exists(dbfile: str) -> None: connection.commit() cursor.close() connection.close() - logging.warning('Database created!') \ No newline at end of file + logging.info('Database created!') \ No newline at end of file diff --git a/telegram/__init__.py b/telegram/__init__.py index 0464acc..6b759aa 100644 --- a/telegram/__init__.py +++ b/telegram/__init__.py @@ -4,12 +4,14 @@ from aiogram.contrib.middlewares.logging import LoggingMiddleware from config import Config from .commands import register_handlers +from .middlewares import OwnerMiddleware config = Config() telegram_bot = Bot(token=config.teletoken) telegram_dispatcher = Dispatcher(telegram_bot) telegram_dispatcher.middleware.setup(LoggingMiddleware()) +telegram_dispatcher.middleware.setup(OwnerMiddleware()) register_handlers(telegram_dispatcher) diff --git a/telegram/commands/__init__.py b/telegram/commands/__init__.py index 8c1b50a..33be00c 100644 --- a/telegram/commands/__init__.py +++ b/telegram/commands/__init__.py @@ -2,7 +2,6 @@ from dataclasses import dataclass import typing from aiogram import Dispatcher -from aiogram.types import Message from .test import telegram_test diff --git a/telegram/middlewares.py b/telegram/middlewares.py new file mode 100644 index 0000000..90298a0 --- /dev/null +++ b/telegram/middlewares.py @@ -0,0 +1,19 @@ +import logging + +from aiogram.types import Message +from aiogram.dispatcher.middlewares import BaseMiddleware + +from config import Config + + +class OwnerMiddleware(BaseMiddleware): + """ + Ignore commands from non-owner. + """ + def __init__(self): + self.bot_owner = Config().bot_owner + super(OwnerMiddleware, self).__init__() + + async def on_pre_process_message(self, message: Message, _): + if message.chat.id != self.bot_owner: + message.text = ''