🏗️ Refactor project structure and update major dependencies

.env.dist

@@ -5,15 +5,12 @@ IP=
 TIMEZONE=
 MODERATE_CHAT=
 
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-DB_HOST=
-DB_PORT=
-POSTGRES_DB=
+SIGNATURE_SECRET_KEY=
+USE_REDIS=
 
-SECRET_KEY=
-API_KEY=
+REDIS_PORT=
+REDIS_HOST=
 
-QIWI_KEY=
-PHONE_NUMBER=
-SECRET_P2=
+API_ID=
+API_HASH=
+SESSION_STR=

.gitignore

@@ -133,4 +133,5 @@ dmypy.json
 
 # Django Settings with Secret key
 /django_project/django_project/settings.py
-photos/
+photos/
+!photos/.gitkeep

.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+exclude: 'docs|frontend|deprecated|README.md|CODE_OF_CONDUCT.md|LICENSE|.github'
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-yaml
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: [ --py38-plus ]
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.1.8"
+    hooks:
+      - id: ruff
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+  - repo: https://github.com/executablebooks/mdformat
+    rev: 0.7.17
+    hooks:
+      - id: mdformat
+        additional_dependencies:
+          - mdformat-gfm
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.5.1
+    hooks:
+      - id: mypy
+        args: [ --follow-imports=silent, --disable-error-code=no-untyped-call, --explicit-package-bases ]
+        exclude: tests/

Dockerfile

@@ -10,4 +10,3 @@ WORKDIR /src
 COPY requirements.txt /src
 RUN pip install -r /src/requirements.txt
 COPY . /src
-

README.md

@@ -9,24 +9,21 @@
 
 ### :monocle_face: About
 
-| 🏗️ The project has moved elsewhere, and currently available at [que.group](https://github.com/QueGroup) |
-|----------------------------------------------------------------------------------------------------------|
-
-Open-source Dating Telegram bot built on aiogram 2.x to facilitate the search for new connections. The bot incorporates
+Open-source Dating Telegram bot built on aiogram 3.x to facilitate the search for new connections. The bot incorporates
 a classic profile browsing system, along with filtering options and event organization capabilities. Users can create
 and join events, fostering community engagement. Additionally, the project is closely integrated with neural networks,
 enhancing its capabilities.
 
 ### :alembic: Built With
 
 ![Python](https://img.shields.io/badge/Python-FFD43B?style=for-the-badge&logo=python&logoColor=blue)\
-![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)\
 ![AIOHTTP](https://img.shields.io/badge/aiohttp-%232C5bb4.svg?style=for-the-badge&logo=aiohttp&logoColor=white)\
 ![Poetry](https://img.shields.io/badge/Poetry-%233B82F6.svg?style=for-the-badge&logo=poetry&logoColor=0B3D8D)\
-![Babel](https://img.shields.io/badge/Babel-F9DC3e?style=for-the-badge&logo=babel&logoColor=black)\
-![Postgresql](https://img.shields.io/badge/PostgreSQL-316192?style=for-the-badge&logo=postgresql&logoColor=white)\
 ![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)\
-![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)
+![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)\
+![Aiogram](https://img.shields.io/badge/aiogram--V3-blue?style=for-the-badge&logo=telegram&logoColor=white)\
+![Redis](https://img.shields.io/badge/redis-%23DD0031.svg?style=for-the-badge&logo=redis&logoColor=white)\
+![GitHub Actions](https://img.shields.io/badge/github%20actions-%232671E5.svg?style=for-the-badge&logo=githubactions&logoColor=white)
 
 ### :hammer: Development
 

babel.cfg

@@ -1,10 +1,7 @@
-[python: data/**.py]
-[python: django_project/**.py]
-[python: filters/**.py]
-[python: functions/**.py]
-[python: handlers/**.py]
-[python: keyboards/**.py]
-[python: logs/**.py]
-[python: middlewares/**.py]
-[python: utils/**.py]
-encoding = utf-8
+[python: src/tgbot/filters/**.py]
+[python: src/tgbot/services/**.py]
+[python: src/tgbot/handlers/**.py]
+[python: src/tgbot/keyboards/**.py]
+[python: src/tgbot/middlewares/**.py]
+[python: src/tgbot/utils/**.py]
+encoding = utf-8

bot.conf

@@ -17,4 +17,4 @@ autorestart=true
 autorestart=true
 environment=HOME="/home/ubuntu",USER="ubuntu"
 stderr_logfile=/home/ubuntu/DatingBot/logfile_err_django.log
-stdout_logfile=/home/ubuntu/DatingBot/logfile_django.log
+stdout_logfile=/home/ubuntu/DatingBot/logfile_django.log

bot.py

@@ -0,0 +1,156 @@
+import asyncio
+import logging
+from typing import (
+    Sequence,
+)
+
+from aiogram import (
+    Bot,
+    Dispatcher,
+)
+from aiogram.client.default import (
+    DefaultBotProperties,
+)
+from aiogram.enums import (
+    ParseMode,
+)
+from aiogram.fsm.storage.memory import (
+    MemoryStorage,
+)
+from aiogram.fsm.storage.redis import (
+    DefaultKeyBuilder,
+    RedisStorage,
+)
+from aiogram.utils.i18n import (
+    ConstI18nMiddleware,
+    I18n,
+)
+import betterlogging as bl
+from que_sdk import (
+    QueClient,
+)
+from redis.asyncio.client import Redis  # type: ignore
+from yandex_geocoder import (
+    Client,
+)
+
+from src.tgbot import (
+    services,
+)
+from src.tgbot.config import (
+    Config,
+    load_config,
+)
+from src.tgbot.handlers import (
+    routers_list,
+)
+from src.tgbot.middlewares import (  # type: ignore
+    AccessControlMiddleware,
+    AlbumMiddleware,
+    DIMiddleware,
+)
+
+
+async def on_startup(bot: Bot, admin_ids: Sequence[int]) -> None:
+    await services.broadcast(bot, list(admin_ids), "Бот запущен")  # type: ignore
+
+
+def setup_logging() -> None:
+    """
+    Set up logging configuration for the application.
+
+    This method initializes the logging configuration for the application.
+    It sets the log level to INFO and configures a basic colorized log for
+    output. The log format includes the filename, line number, log level,
+    timestamp, logger name, and log message.
+
+    Returns:
+        None
+
+    Example usage:
+        setup_logging()
+    """
+    log_level = logging.INFO
+    bl.basic_colorized_config(level=log_level)
+
+    logging.basicConfig(
+        level=logging.INFO,
+        format="%(filename)s:%(lineno)d #%(levelname)-8s [%(asctime)s] - %(name)s - %(message)s",
+    )
+    logger = logging.getLogger(__name__)
+    logger.info("Starting bot")
+
+
+def register_global_middlewares(
+        dp: Dispatcher,
+        config: Config,
+        client: QueClient,
+        redis: Redis,
+        i18n: I18n,
+        ya_client: Client
+) -> None:
+    logging.info("Setup middlewares...")
+    middleware_types = [
+        DIMiddleware(config, client, ya_client),
+        AccessControlMiddleware(client=client),
+        ConstI18nMiddleware(locale="ru", i18n=i18n)
+    ]
+    # dp.message.middleware(ThrottlingMiddleware(redis))
+    dp.message.middleware(AlbumMiddleware())
+    for middleware_type in middleware_types:
+        dp.message.outer_middleware(middleware_type)
+        dp.callback_query.outer_middleware(middleware_type)
+
+
+def get_storage(config: Config) -> MemoryStorage | RedisStorage:
+    """
+    Return storage based on the provided configuration.
+
+    Args:
+        config (Config): The configuration object.
+
+    Returns:
+        Storage: The storage object based on the configuration.
+    """
+    if config.tg_bot.use_redis:
+        return RedisStorage.from_url(
+            config.redis.dsn(),
+            key_builder=DefaultKeyBuilder(with_bot_id=True, with_destiny=True),
+        )
+    else:
+        return MemoryStorage()
+
+
+async def main() -> None:
+    setup_logging()
+
+    config = load_config()
+    i18n = I18n(path=config.tg_bot.LOCALES_DIR, default_locale="ru", domain="messages")
+    storage = get_storage(config)
+    client = QueClient()
+    ya_client = Client(api_key=config.misc.yandex_map_api_key)
+
+    redis = Redis(
+        host=config.redis.host,
+        port=config.redis.port,
+        decode_responses=True,
+        max_connections=10,
+        auto_close_connection_pool=True
+    )
+
+    bot = Bot(token=config.tg_bot.token, default=DefaultBotProperties(parse_mode=ParseMode.MARKDOWN))
+    dp = Dispatcher(storage=storage)
+
+    register_global_middlewares(dp, config, client, redis, i18n, ya_client)
+    dp.include_routers(*routers_list)
+    await services.set_default_commands(bot, config)
+    await on_startup(bot, config.tg_bot.admin_ids)
+    await dp.start_polling(bot)
+
+
+if __name__ == "__main__":
+    try:
+        # FIXME: Почему-то с редисом asyncio.run(main()) не работает
+        asyncio.get_event_loop().run_until_complete(main())
+    except (KeyboardInterrupt, SystemExit):
+        logging.error("Бот был выключен!")