Merge remote-tracking branch 'origin/OCAB-V2' into OCAB-V2

# Conflicts:
#	src/core/main.py

src/__init__.py

@@ -1 +1,2 @@
-import service
+import src.service
+import src.core

src/core/main.py

@@ -1,17 +1,19 @@
-from src.modules.standard.config.config import get_config
-from src.modules.standard.database.models.base import database
-from src.modules.standard.database.db_api import connect_database
+from routers import include_routers
+from src.modules.standard.config.config import get_telegram_token
+from src.modules.standard.database.api import connect_database, create_tables
 
 from asyncio import run
 from aiogram import Bot, Dispatcher
 
-async def main():
+
+async def main(bot: Bot):
     try:
-        database = connect_database()
-        bot = Bot(token=get_config()["TELEGRAM"]["TOKEN"])
+        database, path = connect_database()
+        database.connect()
+        create_tables(database)
 
         dp = Dispatcher()
-
+        await include_routers(dp)
         await dp.start_polling(bot)
 
     finally:
@@ -20,4 +22,5 @@ async def main():
 
 
 if __name__ == "__main__":
-    run(main())
+    bot = Bot(token=get_telegram_token())
+    run(main(bot))

src/core/routers.py

@@ -0,0 +1,11 @@
+from aiogram import Dispatcher
+
+from src.modules.standard.admin.routers import router as admin_router
+
+
+async def include_routers(dp: Dispatcher):
+    """
+    Подключение роутеров в бота
+    dp.include_router()
+    """
+    dp.include_router(admin_router)

src/modules/standard/admin/__init__.py

@@ -0,0 +1 @@
+from . import routers

src/modules/standard/admin/handlers.py

@@ -0,0 +1,13 @@
+from aiogram import Bot
+from aiogram.types import Message
+
+
+async def delete_message(message: Message, bot: Bot):
+    reply_message_id = message.reply_to_message.message_id
+    await bot.delete_message(message.chat.id, reply_message_id)
+
+async def error_access(message: Message, bot: Bot):
+    await message.reply("Вы не админ/модератор")
+
+async def get_chat_id(message: Message, bot: Bot):
+    await message.reply(f"ID данного чата: `{message.chat.id}`", parse_mode="MarkdownV2")

src/modules/standard/admin/info.json

@@ -0,0 +1,6 @@
+{
+  "name": "Admin",
+  "description": "Модуль для работы с админкой",
+  "author": "OCAB Team",
+  "version": "1.0"
+}

src/modules/standard/admin/routers.py

@@ -0,0 +1,11 @@
+from aiogram import Router, F
+
+from src.modules.standard.admin.handlers import delete_message, error_access, get_chat_id
+from src.modules.standard.filters.admin import ChatModerOrAdminFilter
+
+router = Router()
+router.message.register(get_chat_id, ChatModerOrAdminFilter(), F.text == '/chatID')
+
+router.message.register(delete_message, ChatModerOrAdminFilter(), F.text == '/rm')
+router.message.register(error_access, F.text == '/rm')
+router.message.register(error_access, F.text == '/chatID')

src/modules/standard/config/config.py

@@ -12,15 +12,19 @@ def get_config(is_test: bool = False) -> dict:
     with open(path, 'r') as file:
         return yaml.full_load(file)
 
+config = get_config()
+
+def get_telegram_token() -> str:
+    return config["TELEGRAM"]["TOKEN"]
 
 def get_yandexgpt_token() -> str:
-    return get_config()["YANDEX_GPT_TOKEN"]
+    return config["YANDEX_GPT_TOKEN"]
 
 def get_yandexgpt_catalog_id() -> str:
-    return get_config()["YANDEX_GPT_CATALOG_ID"]
+    return config["YANDEX_GPT_CATALOG_ID"]
 
 def get_yandexgpt_prompt() -> str:
-    return get_config()["YANDEX_GPT_PROMPT"]
+    return config["YANDEX_GPT_PROMPT"]
 
 def get_access_rights() -> dict:
     return get_config()["ACCESS_RIGHTS"]

src/modules/standard/database/db_api.py

@@ -22,6 +22,8 @@ def connect_database(is_test: bool = False, module: str | None = None):
     Chats._meta.database = _database
     Messages._meta.database = _database
     Users._meta.database = _database
+    UserStats._meta.database = _database
+    ChatStats._meta.database = _database
 
     return _database, f"{db_path}/OCAB.db"
 

src/modules/standard/filters/admin.py

@@ -0,0 +1,13 @@
+from aiogram.filters import BaseFilter
+from aiogram.types import Message
+from aiogram import Bot
+
+from src.modules.standard.roles.api import Roles
+
+class ChatModerOrAdminFilter(BaseFilter):
+    async def __call__(self, message: Message, bot: Bot) -> bool:
+        user_id = message.from_user.id
+        roles = Roles()
+        admins = await bot.get_chat_administrators(message.chat.id)
+        return await roles.check_admin_permission(user_id) or \
+            await roles.check_moderator_permission(user_id) or any(user_id == admin.user.id for admin in admins)

src/modules/standard/filters/info.json

@@ -0,0 +1,6 @@
+{
+  "name": "Filters",
+  "description": "Модуль с фильтрами",
+  "author": "OCAB Team",
+  "version": "1.0"
+}