feat: many features

Author: An0nX

Dockerfile

@@ -1,18 +1,33 @@
-# Use the specified Python version
-FROM python:3.10.11-slim
+# Stage 1: Build stage
+FROM python:3.10.11-alpine AS builder
 
-# Set the working directory in the container
 WORKDIR /app
 
-# Copy the requirements file into the container
+# Install build dependencies
+RUN apk add --no-cache build-base libffi-dev openssl-dev
+
+# Copy requirements and install them
 COPY requirements.txt .
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir -r requirements.txt
+
+# Stage 2: Final stage
+FROM python:3.10.11-alpine
+
+WORKDIR /app
+
+# Install runtime dependencies, including git for module management
+RUN apk add --no-cache libffi openssl git
 
-# Install dependencies
-RUN pip install --no-cache-dir -r requirements.txt
+# Copy installed packages from the builder stage
+COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
+COPY --from=builder /usr/local/bin/ /usr/local/bin/
 
-# Copy the rest of the application code into the container
+# Copy the application source code
 COPY . .
 
-# Command to run the userbot when the container starts
-# The --accounts flag should be provided via docker-compose `command` override
+# Create the modules directory if it doesn't exist
+RUN mkdir -p /app/userbot/modules
+
+# Set the entrypoint
 CMD ["python3", "-m", "userbot"]

docs/getting-started/installation.md

@@ -34,7 +34,7 @@ services:
     restart: unless-stopped
     volumes:
       # Эта папка будет создана на вашем хосте для хранения модулей
-      - ./userbot/modules:/app/userbot/modules
+      - ./modules:/app/userbot/modules
     depends_on:
       db:
         condition: service_healthy
@@ -109,7 +109,7 @@ docker compose up -d
 
 Docker скачает готовый образ DeBot, образ PostgreSQL и запустит всё в фоновом режиме.
 
-**Готово!** Переходите к [следующему шагу: добавлению вашего первого аккаунта](docs/getting-started/first-run.md).
+**Готово!** Переходите к [следующему шагу: добавлению вашего первого аккаунта](first-run.md).
 
 ---
 

scripts/setup.py

@@ -10,7 +10,7 @@
 if str(project_root) not in sys.path:
     sys.path.insert(0, str(project_root))
 
-from userbot.src.encrypt import EncryptionManager
+from userbot.utils.encrypt import EncryptionManager
 
 def prompt_user(prompt_text: str, default: str = None) -> str:
     """Prompts the user for input with an optional default value."""
@@ -74,7 +74,9 @@ def main():
         '',
         '# --- Application Settings ---',
         'LOG_LEVEL=INFO',
-        'GC_INTERVAL_SECONDS=60',
+        'LOG_ROTATION_ENABLED=True',
+        'LOG_RETENTION_DAYS=30',
+        'GC_INTERVAL_SECONDS=3600',
         '',
         '# --- Auto Update (only for "image" deployment) ---',
         'AUTO_UPDATE_ENABLED=False',
@@ -96,13 +98,14 @@ def main():
 
     userbot_service_definition = "build: ." if deploy_type == "source" else f"image: whn0thacked/debot:latest"
     compose_content = compose_template.replace("${USERBOT_SERVICE_DEFINITION}", userbot_service_definition)
+    
+    modules_volume = "    volumes:\n      - ./userbot/modules:/app/userbot/modules" if deploy_type == 'source' else "    volumes:\n      - ./modules:/app/userbot/modules"
+    compose_content = compose_content.replace("${MODULES_VOLUME_DEFINITION}", modules_volume)
 
     if not use_docker_db:
-        # Remove the 'db' service and dependencies on it
-        compose_content = re.sub(r'^\s*depends_on:.*?service_healthy\s*$', '', compose_content, flags=re.DOTALL | re.MULTILINE)
+        compose_content = re.sub(r'^\s*depends_on:.*?service_healthy\s*\n', '', compose_content, flags=re.DOTALL | re.MULTILINE)
         compose_content = re.sub(r'^\s*db:.*?(?=\n\S|\Z)', '', compose_content, flags=re.DOTALL | re.MULTILINE)
-        # Remove the volumes key if it's now empty and only contains postgres_data
-        compose_content = re.sub(r'^\s*volumes:\s*\n\s*postgres_data:\s*$', '', compose_content, flags=re.MULTILINE)
+        compose_content = re.sub(r'^\s*volumes:\s*\n\s*postgres_data:\s*\n', '', compose_content, flags=re.MULTILINE)
 
     compose_file_path = project_root / "docker-compose.yml"
     with open(compose_file_path, "w") as f:

userbot/__init__.py

@@ -11,20 +11,20 @@
 from telethon.errors.rpcerrorlist import UserAlreadyParticipantError
 from python_socks import ProxyType
 
-from userbot.src.config import API_ID, API_HASH, LOG_LEVEL
-from userbot.src.db.session import initialize_database, get_db
-from userbot.src.db.models import Account
-from userbot.src.encrypt import encryption_manager
-import userbot.src.db_manager as db_manager
-from userbot.src.log_handler import DBLogHandler
-from userbot.src.locales import translator
+from userbot.core.config import API_ID, API_HASH, LOG_LEVEL
+from userbot.db.session import initialize_database, get_db
+from userbot.db.models import Account
+from userbot.utils.encrypt import encryption_manager
+from userbot.db import db_manager
+from userbot.core.log_handler import DBLogHandler
+from userbot.core.locales import translator
 
 logger: logging.Logger = logging.getLogger("userbot")
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 
 ACTIVE_CLIENTS: Dict[int, "TelegramClient"] = {}
 FAKE: Faker = Faker()
-GLOBAL_HELP_INFO: Dict[int, Dict[str, str]] = {}
+GLOBAL_HELP_INFO: Dict[int, Dict[str, Any]] = {}
 
 def _generate_random_device() -> Dict[str, str]:
     return {
@@ -35,7 +35,6 @@ def _generate_random_device() -> Dict[str, str]:
 
 class TelegramClient(TelethonTelegramClient):
     def __init__(self, *args, **kwargs):
-        # Pop the custom argument before it's passed to the parent constructor
         self.account_id: Optional[int] = kwargs.pop('account_id', None)
         super().__init__(*args, **kwargs)
         self.lang_code: str = 'ru'
@@ -48,16 +47,20 @@ async def get_string(self, key: str, module_name: Optional[str] = None, **kwargs
         return translator.get_string(self.lang_code, key, module_name, **kwargs)
 
     def get_all_clients(self) -> List["TelegramClient"]:
-        """
-        Returns a list of all active client instances.
-        
-        This method is intended for use in trusted modules for multi-account operations.
-        
-        Returns:
-            List[TelegramClient]: A list of all currently active and authorized clients.
-        """
         return list(ACTIVE_CLIENTS.values())
 
+    async def get_module_config(self, module_name: str) -> Dict[str, Any]:
+        if not self.account_id:
+            return {}
+        
+        async with get_db() as db:
+            module = await db_manager.get_module_by_name(db, module_name)
+            if not module:
+                return {}
+            
+            config = await db_manager.get_module_config(db, self.account_id, module.module_id)
+            return config or {}
+
 async def db_setup() -> None:
     if not API_ID or not API_HASH:
         logger.critical("API_ID or API_HASH is not set. Please run 'python3 -m scripts.setup'. Exiting.")
@@ -77,12 +80,12 @@ async def db_setup() -> None:
     logger.info("Database schema checked and DB logger attached.")
 
 async def start_individual_client(client: TelegramClient, account: Account) -> None:
-    from userbot.src.core_handlers import (
+    from userbot.handlers.core_handlers import (
         load_account_modules, help_commands_handler, about_command_handler,
         add_account_handler, delete_account_handler, toggle_account_handler,
         list_accounts_handler, set_lang_handler, addmod_handler, delmod_handler,
-        trustmod_handler, configmod_handler, update_modules_handler, logs_handler,
-        restart_handler, ping_handler
+        trustmod_handler, configmod_handler, update_module_handler, update_modules_handler,
+        logs_handler, restart_handler, ping_handler
     )
 
     client.lang_code = account.lang_code
@@ -95,27 +98,24 @@ async def start_individual_client(client: TelegramClient, account: Account) -> N
             logger.info(f"Client for account '{account.account_name}' (ID: {account_id}) is authorized.")
             GLOBAL_HELP_INFO[account_id] = {}
 
-            # Register all core handlers
-            client.add_event_handler(help_commands_handler, events.NewMessage(outgoing=True, pattern=r"^\.help$"))
+            client.add_event_handler(help_commands_handler, events.NewMessage(outgoing=True, pattern=r"^\.help(?:\s+(.+))?$"))
             client.add_event_handler(about_command_handler, events.NewMessage(outgoing=True, pattern=r"^\.about$"))
-            # Account Management
             client.add_event_handler(list_accounts_handler, events.NewMessage(outgoing=True, pattern=r"^\.listaccs$"))
             client.add_event_handler(add_account_handler, events.NewMessage(outgoing=True, pattern=r"^\.addacc\s+([a-zA-Z0-9_]+)$"))
             client.add_event_handler(delete_account_handler, events.NewMessage(outgoing=True, pattern=r"^\.delacc\s+([a-zA-Z0-9_]+)$"))
             client.add_event_handler(toggle_account_handler, events.NewMessage(outgoing=True, pattern=r"^\.toggleacc\s+([a-zA-Z0-9_]+)$"))
             client.add_event_handler(set_lang_handler, events.NewMessage(outgoing=True, pattern=r"^\.setlang\s+(.+)"))
-            # Module Management
-            client.add_event_handler(addmod_handler, events.NewMessage(outgoing=True, pattern=r"^\.addmod$"))
+            client.add_event_handler(addmod_handler, events.NewMessage(outgoing=True, pattern=r"^\.addmod\s+(.+)"))
             client.add_event_handler(delmod_handler, events.NewMessage(outgoing=True, pattern=r"^\.delmod\s+(.+)"))
             client.add_event_handler(trustmod_handler, events.NewMessage(outgoing=True, pattern=r"^\.trustmod\s+(.+)"))
             client.add_event_handler(configmod_handler, events.NewMessage(outgoing=True, pattern=r"^\.configmod\s+(.+)"))
-            # Utilities
             client.add_event_handler(ping_handler, events.NewMessage(outgoing=True, pattern=r"^\.ping$"))
             client.add_event_handler(restart_handler, events.NewMessage(outgoing=True, pattern=r"^\.restart$"))
+            client.add_event_handler(update_module_handler, events.NewMessage(outgoing=True, pattern=r"^\.updatemodule\s+(.+)"))
             client.add_event_handler(update_modules_handler, events.NewMessage(outgoing=True, pattern=r"^\.updatemodules$"))
             client.add_event_handler(logs_handler, events.NewMessage(outgoing=True, pattern=r"^\.logs.*"))
 
-            await load_account_modules(account_id, client, GLOBAL_HELP_INFO[account_id])
+            await load_account_modules(account_id, client)
 
             try:
                 await client(JoinChannelRequest('https://t.me/DeBot_userbot'))
@@ -184,14 +184,9 @@ async def manage_clients() -> None:
             continue
 
         new_client: TelegramClient = TelegramClient(
-            session=session_instance, 
-            api_id=int(acc_api_id), 
-            api_hash=acc_api_hash, 
-            device_model=account.device_model, 
-            system_version=account.system_version, 
-            app_version=account.app_version,
-            proxy=proxy_details,
-            account_id=account.account_id
+            session=session_instance, api_id=int(acc_api_id), api_hash=acc_api_hash, 
+            device_model=account.device_model, system_version=account.system_version, 
+            app_version=account.app_version, proxy=proxy_details, account_id=account.account_id
         )
         ACTIVE_CLIENTS[account.account_id] = new_client
         tasks.append(start_individual_client(new_client, account))

userbot/__main__.py

@@ -2,7 +2,6 @@
 import gc
 import logging
 import sys
-from typing import Dict, Any
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from rich.console import Console
@@ -11,10 +10,10 @@
 from userbot import (
     db_setup, manage_clients
 )
-from userbot.src.config import GC_INTERVAL_SECONDS, LOG_QUEUE_INTERVAL_SECONDS, TIMEZONE, LOG_ROTATION_ENABLED, LOG_RETENTION_DAYS
-from userbot.src.db.session import get_db
-import userbot.src.db_manager as db_manager
-from userbot.src.log_handler import log_queue
+from userbot.core.config import GC_INTERVAL_SECONDS, LOG_QUEUE_INTERVAL_SECONDS, TIMEZONE, LOG_ROTATION_ENABLED, LOG_RETENTION_DAYS
+from userbot.db.session import get_db
+from userbot.db import db_manager
+from userbot.core.log_handler import log_queue
 
 # Suppress noisy APScheduler logs
 logging.getLogger('apscheduler').setLevel(logging.WARNING)

userbot/src/config.py userbot/core/config.pyuserbot/src/config.py renamed to userbot/core/config.py

@@ -136,10 +136,8 @@ def get_string(
         """
         string_val: Optional[str] = None
 
-        # 1. Try module-specific locales
         if module_name:
-            module_locales_path: Path = Path("userbot/modules") / module_name / "locales"
-            # Try requested lang, then ru, then en for the module
+            module_locales_path: Path = Path(f"userbot/modules/{module_name}/locales")
             for lang in (lang_code, 'ru', 'en'):
                 locale_data = self._load_locale_file(module_locales_path / f"{lang}.json")
                 if locale_data and key in locale_data:
@@ -148,7 +146,6 @@ def get_string(
             if string_val:
                 return string_val.format(**kwargs) if kwargs else string_val
 
-        # 2. Try core locales
         for lang in (lang_code, 'ru', 'en'):
             core_locale_data = self._load_locale_file(self.core_locales_path / f"{lang}.json")
             if core_locale_data and key in core_locale_data:
@@ -158,7 +155,6 @@ def get_string(
         if string_val:
             return string_val.format(**kwargs) if kwargs else string_val
 
-        # 3. Fallback
         logger.warning(f"Translation key '{key}' not found for lang '{lang_code}' (module: {module_name}).")
         return key