Merge branch 'main' of ssh://git.smartsoltech.kr:2222/trevor/post_bot

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . /app
-COPY requirements.txt /app/requirements.txt
+RUN apt update && apt install -y gcc && apt install -y sqlite3
 RUN pip install --no-cache-dir -r requirements.txt
 CMD ["python", "main.py"]

alembic.ini

@@ -0,0 +1,147 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
+script_location = %(here)s/alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
+prepend_sys_path = .
+
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
+# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to <script_location>/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "path_separator"
+# below.
+# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
+
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
+#
+# Valid values for path_separator are:
+#
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+path_separator = os
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
+sqlalchemy.url = sqlite:///bot.db
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# hooks = ruff
+# ruff.type = module
+# ruff.module = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Alternatively, use the exec runner to execute a binary found on your PATH
+# hooks = ruff
+# ruff.type = exec
+# ruff.executable = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Logging configuration.  This is also consumed by the user-maintained
+# env.py script only.
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,53 @@
+from logging.config import fileConfig
+
+from sqlalchemy import create_engine, pool
+
+from alembic import context
+import os
+
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+from models import Base
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    url = os.getenv("DATABASE_URL", config.get_main_option("sqlalchemy.url"))
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    url = config.get_main_option("sqlalchemy.url")
+    connectable = create_engine(url, poolclass=pool.NullPool)
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}

alembic/versions/eeb6744b9452_init.py

@@ -0,0 +1,57 @@
+"""init
+
+Revision ID: eeb6744b9452
+Revises: 
+Create Date: 2025-09-05 14:55:12.005564
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'eeb6744b9452'
+down_revision: Union[str, Sequence[str], None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Создание всех таблиц согласно моделям."""
+    op.create_table(
+        'admins',
+        sa.Column('id', sa.Integer(), primary_key=True),
+        sa.Column('tg_id', sa.Integer(), unique=True, nullable=False),
+    )
+    op.create_table(
+        'channels',
+        sa.Column('id', sa.Integer(), primary_key=True),
+        sa.Column('name', sa.String, nullable=True),
+        sa.Column('link', sa.String, nullable=True),
+        sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
+    )
+    op.create_table(
+        'groups',
+        sa.Column('id', sa.Integer(), primary_key=True),
+        sa.Column('name', sa.String, nullable=False),
+        sa.Column('link', sa.String, nullable=False),
+        sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
+    )
+    op.create_table(
+        'buttons',
+        sa.Column('id', sa.Integer(), primary_key=True),
+        sa.Column('name', sa.String, nullable=False),
+        sa.Column('url', sa.String, nullable=False),
+        sa.Column('channel_id', sa.Integer(), sa.ForeignKey('channels.id'), nullable=True),
+        sa.Column('group_id', sa.Integer(), sa.ForeignKey('groups.id'), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    """Удаление всех таблиц."""
+    op.drop_table('buttons')
+    op.drop_table('groups')
+    op.drop_table('channels')
+    op.drop_table('admins')

bin/update.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+echo "[update.sh] Проверка bot.db..."
+if [ -d "bot.db" ]; then
+  echo "Удаляю папку bot.db..."
+  rm -rf bot.db
+fi
+if [ ! -f "bot.db" ]; then
+  echo "Создаю пустой файл bot.db..."
+  touch bot.db
+fi
+
+echo "[update.sh] Получение свежего кода..."
+git pull
+
+echo "[update.sh] Пересборка контейнера..."
+docker compose build --no-cache
+
+echo "[update.sh] Применение миграций Alembic..."
+docker compose run --rm bot alembic upgrade head
+
+echo "[update.sh] Запуск контейнера..."
+docker compose up -d
+
+echo "[update.sh] Готово!"

db.py

@@ -1,13 +1,75 @@
-import os
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-from models import Base
 from dotenv import load_dotenv
-
 load_dotenv()
-DATABASE_URL = os.getenv('DATABASE_URL', 'sqlite:///bot.db')
-engine = create_engine(DATABASE_URL, echo=True)
-SessionLocal = sessionmaker(bind=engine)
+import os
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
+from sqlalchemy.orm import declarative_base
+from sqlalchemy.ext.asyncio import async_sessionmaker
 
-def init_db():
-    Base.metadata.create_all(engine)
+DATABASE_URL = os.getenv("DATABASE_URL", "sqlite+aiosqlite:///bot.db")
+
+if DATABASE_URL.startswith("sqlite+aiosqlite:///"):
+    db_path = DATABASE_URL.replace("sqlite+aiosqlite:///", "")
+    abs_db_path = os.path.abspath(db_path)
+    db_dir = os.path.dirname(abs_db_path)
+    # Создаём директорию только если она не равна текущей ('.') и не пустая
+    if db_dir and db_dir != os.path.abspath("") and db_dir != '.' and not os.path.exists(db_dir):
+        os.makedirs(db_dir, exist_ok=True)
+    # Если по этому пути уже есть папка, удаляем её
+    if os.path.exists(abs_db_path) and os.path.isdir(abs_db_path):
+        import shutil
+        shutil.rmtree(abs_db_path)
+    # Если файла нет, создаём пустой файл
+    if not os.path.exists(abs_db_path):
+        open(abs_db_path, 'a').close()
+
+engine = create_async_engine(DATABASE_URL, future=True, echo=False)
+AsyncSessionLocal = async_sessionmaker(engine, expire_on_commit=False)
+Base = declarative_base()
+
+async def init_db():
+    print(f'База данных: {DATABASE_URL}')
+    need_create = False
+    if DATABASE_URL.startswith("sqlite+aiosqlite:///"):
+        db_path = DATABASE_URL.replace("sqlite+aiosqlite:///", "")
+        abs_db_path = os.path.abspath(db_path)
+        print(f"Абсолютный путь к базе данных: {abs_db_path}")
+        # Если файл отсутствует или пустой, или это папка — создаём таблицы
+        if not os.path.exists(abs_db_path):
+            print("Файл базы данных отсутствует, будет создан.")
+            need_create = True
+        elif os.path.isdir(abs_db_path):
+            print("Вместо файла обнаружена папка, будет удалена и создан файл.")
+            import shutil
+            shutil.rmtree(abs_db_path)
+            open(abs_db_path, 'a').close()
+            need_create = True
+        elif os.path.getsize(abs_db_path) == 0:
+            print("Файл базы данных пустой, будут созданы таблицы.")
+            need_create = True
+        else:
+            # Проверяем наличие таблиц
+            import sqlite3
+            try:
+                conn = sqlite3.connect(abs_db_path)
+                cursor = conn.cursor()
+                cursor.execute("SELECT name FROM sqlite_master WHERE type='table';")
+                tables = cursor.fetchall()
+                conn.close()
+                if not tables:
+                    print("В базе нет таблиц, будут созданы.")
+                    need_create = True
+            except Exception as e:
+                print(f"Ошибка проверки таблиц: {e}")
+                need_create = True
+    else:
+        print(f"База данных: {DATABASE_URL}")
+        # Для других СУБД всегда пытаемся создать таблицы
+        need_create = True
+
+    if need_create:
+        async with engine.begin() as conn:
+            await conn.run_sync(Base.metadata.create_all)
+            tables = Base.metadata.tables.keys()
+            print(f"Созданы таблицы: {', '.join(tables)}")
+    else:
+        print("База данных уже существует и содержит таблицы, создание пропущено.")

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   bot:
     build: .

handlers/add_button.py

@@ -1,58 +1,76 @@
-from telegram import Update
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import ContextTypes, ConversationHandler, CommandHandler, CallbackQueryHandler, MessageHandler, filters
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Channel, Group, Button
 
 SELECT_TARGET, INPUT_NAME, INPUT_URL = range(3)
 
 async def add_button_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     # Если выбран канал или группа уже сохранены — сразу переход к названию
-    if context.user_data.get('channel_id'):
-        context.user_data['target'] = f"channel_{context.user_data['channel_id']}"
+    if context.user_data is None:
+        context.user_data = {}
+    user_data = context.user_data
+    if user_data.get('channel_id'):
+        context.user_data['target'] = f"channel_{user_data['channel_id']}"
+        if update.message:
             await update.message.reply_text('Введите название кнопки:')
         return INPUT_NAME
-    elif context.user_data.get('group_id'):
-        context.user_data['target'] = f"group_{context.user_data['group_id']}"
+    elif user_data.get('group_id'):
+        context.user_data['target'] = f"group_{user_data['group_id']}"
+        if update.message:
             await update.message.reply_text('Введите название кнопки:')
         return INPUT_NAME
     # Если нет — стандартный выбор
-    session = SessionLocal()
-    channels = session.query(Channel).all()
-    groups = session.query(Group).all()
-    session.close()
+    from sqlalchemy import select
+    async with AsyncSessionLocal() as session:
+        result_channels = await session.execute(select(Channel))
+        channels = result_channels.scalars().all()
+        result_groups = await session.execute(select(Group))
+        groups = result_groups.scalars().all()
     keyboard = []
     for c in channels:
-        keyboard.append([{'text': f'Канал: {c.name}', 'callback_data': f'channel_{c.id}'}])
+        keyboard.append([InlineKeyboardButton(f'Канал: {getattr(c, "name", str(c.name))}', callback_data=f'channel_{getattr(c, "id", str(c.id))}')])
     for g in groups:
-        keyboard.append([{'text': f'Группа: {g.name}', 'callback_data': f'group_{g.id}'}])
+        keyboard.append([InlineKeyboardButton(f'Группа: {getattr(g, "name", str(g.name))}', callback_data=f'group_{getattr(g, "id", str(g.id))}')])
     if not keyboard:
+        if update.message:
             await update.message.reply_text('Нет каналов или групп для добавления кнопки.')
         return ConversationHandler.END
-    await update.message.reply_text('Выберите канал или группу:', reply_markup=None)
+    if update.message:
+        await update.message.reply_text('Выберите канал или группу:', reply_markup=InlineKeyboardMarkup(keyboard))
     context.user_data['keyboard'] = keyboard
     return SELECT_TARGET
 
 async def select_target(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
     query = update.callback_query
+    if query:
         await query.answer()
         data = query.data
         context.user_data['target'] = data
         await query.edit_message_text('Введите название кнопки:')
         return INPUT_NAME
+    return ConversationHandler.END
 
 async def input_name(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    if update.message and hasattr(update.message, 'text'):
         context.user_data['button_name'] = update.message.text
         await update.message.reply_text('Введите ссылку для кнопки:')
         return INPUT_URL
+    return ConversationHandler.END
 
 async def input_url(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    url = update.message.text
-    name = context.user_data.get('button_name')
-    target = context.user_data.get('target')
-    if not target or ('_' not in target):
+    url = update.message.text if update.message and hasattr(update.message, 'text') else None
+    name = context.user_data.get('button_name') if context.user_data else None
+    target = context.user_data.get('target') if context.user_data else None
+    if not url or not name or not target or ('_' not in target):
+        if update.message:
             await update.message.reply_text('Ошибка: не выбран канал или группа. Попробуйте снова.')
         return ConversationHandler.END
-    session = SessionLocal()
+    session = AsyncSessionLocal()
     try:
         type_, obj_id = target.split('_', 1)
         obj_id = int(obj_id)
@@ -61,16 +79,19 @@ async def input_url(update: Update, context: ContextTypes.DEFAULT_TYPE):
         elif type_ == 'group':
             button = Button(name=name, url=url, group_id=obj_id)
         else:
+            if update.message:
                 await update.message.reply_text('Ошибка: неверный тип объекта.')
-            session.close()
+            await session.close()
             return ConversationHandler.END
         session.add(button)
-        session.commit()
+        await session.commit()
+        if update.message:
             await update.message.reply_text('Кнопка добавлена.')
     except Exception as e:
+        if update.message:
             await update.message.reply_text(f'Ошибка при добавлении кнопки: {e}')
     finally:
-        session.close()
+        await session.close()
     return ConversationHandler.END
 
 add_button_conv = ConversationHandler(

handlers/add_channel.py

@@ -1,17 +1,60 @@
+
 from telegram import Update
-from telegram.ext import ContextTypes
-from db import SessionLocal
+from telegram.ext import ContextTypes, ConversationHandler, CommandHandler, MessageHandler, filters
+from db import AsyncSessionLocal
 from models import Channel
 
-async def add_channel(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    args = context.args
-    if len(args) < 2:
-        await update.message.reply_text('Используйте: /add_channel <название> <ссылка>')
-        return
-    name, link = args[0], args[1]
-    session = SessionLocal()
+INPUT_NAME, INPUT_LINK = range(2)
+
+async def add_channel_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    if update.message:
+        await update.message.reply_text('Введите имя канала:')
+    return INPUT_NAME
+
+async def input_channel_name(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    text = update.message.text.strip() if update.message and update.message.text else ''
+    context.user_data['channel_name'] = text
+    if update.message:
+        await update.message.reply_text('Теперь отправьте ссылку на канал (должна начинаться с @):')
+    return INPUT_LINK
+
+async def input_channel_link(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    link = update.message.text.strip() if update.message and update.message.text else ''
+    if not link.startswith('@'):
+        if update.message:
+            await update.message.reply_text('Ошибка: ссылка на канал должна начинаться с @. Попробуйте снова.')
+        return INPUT_LINK
+    context.user_data['channel_link'] = link
+    return await save_channel(update, context)
+
+async def save_channel(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    name = context.user_data.get('channel_name')
+    link = context.user_data.get('channel_link')
+    if not name or not link:
+        if update.message:
+            await update.message.reply_text('Ошибка: не указано название или ссылка.')
+        return ConversationHandler.END
+    async with AsyncSessionLocal() as session:
         channel = Channel(name=name, link=link)
         session.add(channel)
-    session.commit()
-    session.close()
+        await session.commit()
+    if update.message:
         await update.message.reply_text(f'Канал "{name}" добавлен.')
+    return ConversationHandler.END
+
+add_channel_conv = ConversationHandler(
+    entry_points=[CommandHandler('add_channel', add_channel_start)],
+    states={
+        INPUT_NAME: [MessageHandler(filters.TEXT & ~filters.COMMAND, input_channel_name)],
+        INPUT_LINK: [MessageHandler(filters.TEXT & ~filters.COMMAND, input_channel_link)],
+    },
+    fallbacks=[]
+)

handlers/add_group.py

@@ -1,17 +1,60 @@
+
 from telegram import Update
-from telegram.ext import ContextTypes
-from db import SessionLocal
+from telegram.ext import ContextTypes, ConversationHandler, CommandHandler, MessageHandler, filters
+from db import AsyncSessionLocal
 from models import Group
 
-async def add_group(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    args = context.args
-    if len(args) < 2:
-        await update.message.reply_text('Используйте: /add_group <название> <ссылка>')
-        return
-    name, link = args[0], args[1]
-    session = SessionLocal()
+INPUT_NAME, INPUT_LINK = range(2)
+
+async def add_group_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    if update.message:
+        await update.message.reply_text('Введите имя группы:')
+    return INPUT_NAME
+
+async def input_group_name(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    text = update.message.text.strip() if update.message and update.message.text else ''
+    context.user_data['group_name'] = text
+    if update.message:
+        await update.message.reply_text('Теперь отправьте chat_id группы (например, -1001234567890):')
+    return INPUT_LINK
+
+async def input_group_link(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    link = update.message.text.strip() if update.message and update.message.text else ''
+    if not link.startswith('-100'):
+        if update.message:
+            await update.message.reply_text('Ошибка: chat_id группы должен начинаться с -100. Попробуйте снова.')
+        return INPUT_LINK
+    context.user_data['group_link'] = link
+    return await save_group(update, context)
+
+async def save_group(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if context.user_data is None:
+        context.user_data = {}
+    name = context.user_data.get('group_name')
+    link = context.user_data.get('group_link')
+    if not name or not link:
+        if update.message:
+            await update.message.reply_text('Ошибка: не указано название или ссылка.')
+        return ConversationHandler.END
+    async with AsyncSessionLocal() as session:
         group = Group(name=name, link=link)
         session.add(group)
-    session.commit()
-    session.close()
+        await session.commit()
+    if update.message:
         await update.message.reply_text(f'Группа "{name}" добавлена.')
+    return ConversationHandler.END
+
+add_group_conv = ConversationHandler(
+    entry_points=[CommandHandler('add_group', add_group_start)],
+    states={
+        INPUT_NAME: [MessageHandler(filters.TEXT & ~filters.COMMAND, input_group_name)],
+        INPUT_LINK: [MessageHandler(filters.TEXT & ~filters.COMMAND, input_group_link)],
+    },
+    fallbacks=[]
+)

handlers/admin_panel.py

@@ -0,0 +1,40 @@
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
+from telegram.ext import CommandHandler, CallbackQueryHandler, ConversationHandler, ContextTypes
+from db import AsyncSessionLocal
+from models import Admin, Channel, Group, Button
+
+ADMIN_MENU, PREVIEW_POST = range(2)
+
+async def admin_panel(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    user_id = update.effective_user.id if update.effective_user else None
+    async with AsyncSessionLocal() as session:
+        # Получаем каналы и группы, которыми управляет админ
+        channels_result = await session.execute(Channel.__table__.select().where(Channel.admin_id == user_id))
+        channels = channels_result.scalars().all()
+        groups_result = await session.execute(Group.__table__.select().where(Group.admin_id == user_id))
+        groups = groups_result.scalars().all()
+        # Статистика
+        buttons_result = await session.execute(Button.__table__.select())
+        buttons = buttons_result.scalars().all()
+        stats = f"Каналов: {len(channels)}\nГрупп: {len(groups)}\nКнопок: {len(buttons)}"
+        text = f"<b>Ваша админ-панель</b>\n\n{stats}\n\nВаши каналы:\n" + '\n'.join([f"- {c.name}" for c in channels]) + "\n\nВаши группы:\n" + '\n'.join([f"- {g.name}" for g in groups])
+        keyboard = []
+        # Кнопка предпросмотра поста (можно доработать)
+        keyboard.append([InlineKeyboardButton("Предпросмотр поста", callback_data="preview_post")])
+        await update.message.reply_text(text, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML')
+        return ADMIN_MENU
+
+async def preview_post_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    query = update.callback_query
+    await query.answer()
+    # Здесь можно реализовать предпросмотр поста с кнопками
+    await query.edit_message_text("Здесь будет предпросмотр поста с кнопками.")
+    return ConversationHandler.END
+
+admin_panel_conv = ConversationHandler(
+    entry_points=[CommandHandler('admin', admin_panel)],
+    states={
+        ADMIN_MENU: [CallbackQueryHandler(preview_post_callback, pattern="preview_post")],
+    },
+    fallbacks=[]
+)

handlers/channel_buttons.py

@@ -1,34 +1,47 @@
 from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import CommandHandler, CallbackQueryHandler, ConversationHandler, ContextTypes
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Channel, Button
 
 SELECT_CHANNEL, MANAGE_BUTTONS = range(2)
 
 async def channel_buttons_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    session = SessionLocal()
-    channels = session.query(Channel).all()
-    session.close()
-    keyboard = [[InlineKeyboardButton(c.name, callback_data=str(c.id))] for c in channels]
+    from sqlalchemy import select
+    session = AsyncSessionLocal()
+    try:
+        channels_result = await session.execute(select(Channel))
+        channels = channels_result.scalars().all()
+        keyboard = [[InlineKeyboardButton(f'{getattr(c, "name", str(c.name))}', callback_data=str(getattr(c, "id", str(c.id))))] for c in channels]
+        if update.message:
             await update.message.reply_text(
                 "Выберите канал для настройки клавиатуры:",
                 reply_markup=InlineKeyboardMarkup(keyboard)
             )
             return SELECT_CHANNEL
+        return ConversationHandler.END
+    finally:
+        await session.close()
 
 async def select_channel(update: Update, context: ContextTypes.DEFAULT_TYPE):
     query = update.callback_query
+    if query and query.data:
         await query.answer()
         channel_id = int(query.data)
+        if context.user_data is None:
+            context.user_data = {}
         context.user_data['channel_id'] = channel_id
-    session = SessionLocal()
-    buttons = session.query(Button).filter_by(channel_id=channel_id).all()
-    session.close()
+        from sqlalchemy import select
+        session = AsyncSessionLocal()
+        try:
+            buttons_result = await session.execute(select(Button).where(Button.channel_id == channel_id))
+            buttons = buttons_result.scalars().all()
             text = "Кнопки этого канала:\n"
             for b in buttons:
                 text += f"- {b.name}: {b.url}\n"
             text += "\nДобавить новую кнопку: /add_button\nУдалить: /del_button <название>"
             await query.edit_message_text(text)
+        finally:
+            await session.close()
     return ConversationHandler.END
 
 channel_buttons_conv = ConversationHandler(

handlers/del_button.py

@@ -1,21 +1,27 @@
 from telegram import Update
 from telegram.ext import CommandHandler, ContextTypes
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Button
 
 async def del_button(update: Update, context: ContextTypes.DEFAULT_TYPE):
     args = context.args
     if not args:
+        if update.message:
             await update.message.reply_text('Используйте: /del_button <название>')
         return
     name = args[0]
-    session = SessionLocal()
-    button = session.query(Button).filter_by(name=name).first()
+    session = AsyncSessionLocal()
+    try:
+        from sqlalchemy import select
+        result = await session.execute(select(Button).where(Button.name == name))
+        button = result.scalar_one_or_none()
         if not button:
+            if update.message:
                 await update.message.reply_text('Кнопка не найдена.')
-        session.close()
             return
-    session.delete(button)
-    session.commit()
-    session.close()
+        await session.delete(button)
+        await session.commit()
+        if update.message:
             await update.message.reply_text(f'Кнопка "{name}" удалена.')
+    finally:
+        await session.close()

handlers/edit_button.py

@@ -1,6 +1,6 @@
 from telegram import Update
 from telegram.ext import CommandHandler, ContextTypes
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Button
 
 async def edit_button(update: Update, context: ContextTypes.DEFAULT_TYPE):
@@ -9,14 +9,18 @@ async def edit_button(update: Update, context: ContextTypes.DEFAULT_TYPE):
         await update.message.reply_text('Используйте: /edit_button <название> <новое_название> <новая_ссылка>')
         return
     name, new_name, new_url = args[0], args[1], args[2]
-    session = SessionLocal()
-    button = session.query(Button).filter_by(name=name).first()
+    session = AsyncSessionLocal()
+    try:
+        result = await session.execute(Button.__table__.select().where(Button.name == name))
+        button = result.scalar_one_or_none()
         if not button:
+            if update.message:
                 await update.message.reply_text('Кнопка не найдена.')
-        session.close()
             return
         button.name = new_name
         button.url = new_url
-    session.commit()
-    session.close()
+        await session.commit()
+        if update.message:
             await update.message.reply_text(f'Кнопка "{name}" изменена.')
+    finally:
+        await session.close()

handlers/group_buttons.py

@@ -1,34 +1,45 @@
 from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import CommandHandler, CallbackQueryHandler, ConversationHandler, ContextTypes
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Group, Button
 
 SELECT_GROUP, MANAGE_BUTTONS = range(2)
 
 async def group_buttons_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    session = SessionLocal()
-    groups = session.query(Group).all()
-    session.close()
-    keyboard = [[InlineKeyboardButton(g.name, callback_data=str(g.id))] for g in groups]
+    session = AsyncSessionLocal()
+    try:
+        groups_result = await session.execute(Group.__table__.select())
+        groups = groups_result.scalars().all()
+        keyboard = [[InlineKeyboardButton(f'{getattr(g, "name", str(g.name))}', callback_data=str(getattr(g, "id", str(g.id))))] for g in groups]
+        if update.message:
             await update.message.reply_text(
                 "Выберите группу для настройки клавиатуры:",
                 reply_markup=InlineKeyboardMarkup(keyboard)
             )
             return SELECT_GROUP
+        return ConversationHandler.END
+    finally:
+        await session.close()
 
 async def select_group(update: Update, context: ContextTypes.DEFAULT_TYPE):
     query = update.callback_query
+    if query and query.data:
         await query.answer()
         group_id = int(query.data)
+        if context.user_data is None:
+            context.user_data = {}
         context.user_data['group_id'] = group_id
-    session = SessionLocal()
-    buttons = session.query(Button).filter_by(group_id=group_id).all()
-    session.close()
+        session = AsyncSessionLocal()
+        try:
+            buttons_result = await session.execute(Button.__table__.select().where(Button.group_id == group_id))
+            buttons = buttons_result.scalars().all()
             text = "Кнопки этой группы:\n"
             for b in buttons:
                 text += f"- {b.name}: {b.url}\n"
             text += "\nДобавить новую кнопку: /add_button\nУдалить: /del_button <название>"
             await query.edit_message_text(text)
+        finally:
+            await session.close()
     return ConversationHandler.END
 
 group_buttons_conv = ConversationHandler(

handlers/new_post.py

@@ -1,65 +1,95 @@
 from telegram import Update, InputMediaPhoto, InlineKeyboardMarkup, InlineKeyboardButton
 from telegram.ext import ContextTypes, ConversationHandler, MessageHandler, CommandHandler, filters, CallbackQueryHandler, ContextTypes
 
-from db import SessionLocal
+from db import AsyncSessionLocal
 from models import Channel, Group, Button
 
 SELECT_MEDIA, SELECT_TEXT, SELECT_TARGET = range(3)
 
 async def new_post_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    if update.message:
         await update.message.reply_text('Отправьте картинку для поста или /skip:')
         return SELECT_MEDIA
+    return ConversationHandler.END
 
 async def select_media(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    if update.message.photo:
+    if update.message and hasattr(update.message, 'photo') and update.message.photo:
+        if context.user_data is None:
+            context.user_data = {}
         context.user_data['photo'] = update.message.photo[-1].file_id
+    if update.message:
         await update.message.reply_text('Введите текст поста или пересланное сообщение:')
         return SELECT_TEXT
+    return ConversationHandler.END
 
 async def select_text(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    context.user_data['text'] = update.message.text or update.message.caption
-    session = SessionLocal()
-    channels = session.query(Channel).all()
-    groups = session.query(Group).all()
-    session.close()
+    if update.message:
+        if context.user_data is None:
+            context.user_data = {}
+        context.user_data['text'] = getattr(update.message, 'text', None) or getattr(update.message, 'caption', None)
+        from sqlalchemy import select
+        session = AsyncSessionLocal()
+        try:
+            channels_result = await session.execute(select(Channel))
+            channels = channels_result.scalars().all()
+            groups_result = await session.execute(select(Group))
+            groups = groups_result.scalars().all()
             keyboard = []
             for c in channels:
-        keyboard.append([InlineKeyboardButton(f'Канал: {c.name}', callback_data=f'channel_{c.id}')])
+                keyboard.append([InlineKeyboardButton(f'Канал: {getattr(c, "name", str(c.name))}', callback_data=f'channel_{getattr(c, "id", str(c.id))}')])
             for g in groups:
-        keyboard.append([InlineKeyboardButton(f'Группа: {g.name}', callback_data=f'group_{g.id}')])
+                keyboard.append([InlineKeyboardButton(f'Группа: {getattr(g, "name", str(g.name))}', callback_data=f'group_{getattr(g, "id", str(g.id))}')])
             reply_markup = InlineKeyboardMarkup(keyboard)
             await update.message.reply_text('Выберите, куда отправить пост:', reply_markup=reply_markup)
             return SELECT_TARGET
+        finally:
+            await session.close()
+    return ConversationHandler.END
 
 async def select_target(update: Update, context: ContextTypes.DEFAULT_TYPE):
     query = update.callback_query
+    if not query:
+        return ConversationHandler.END
     await query.answer()
     data = query.data
-    session = SessionLocal()
+    session = AsyncSessionLocal()
     try:
-        if data.startswith('channel_'):
+        chat_id = None
+        markup = None
+        if data and data.startswith('channel_'):
+            from sqlalchemy import select
             channel_id = int(data.split('_')[1])
-            channel = session.query(Channel).get(channel_id)
-            buttons = session.query(Button).filter_by(channel_id=channel_id).all()
-            markup = InlineKeyboardMarkup([[InlineKeyboardButton(b.name, url=b.url)] for b in buttons]) if buttons else None
-            chat_id = channel.link.strip()
-        else:
+            channel_result = await session.execute(select(Channel).where(Channel.id == channel_id))
+            channel = channel_result.scalar_one_or_none()
+            buttons_result = await session.execute(select(Button).where(Button.channel_id == channel_id))
+            buttons = buttons_result.scalars().all()
+            markup = InlineKeyboardMarkup([[InlineKeyboardButton(str(b.name), url=str(b.url))] for b in buttons]) if buttons else None
+            chat_id = getattr(channel, 'link', None)
+        elif data and data.startswith('group_'):
+            from sqlalchemy import select
             group_id = int(data.split('_')[1])
-            group = session.query(Group).get(group_id)
-            buttons = session.query(Button).filter_by(group_id=group_id).all()
-            markup = InlineKeyboardMarkup([[InlineKeyboardButton(b.name, url=b.url)] for b in buttons]) if buttons else None
-            chat_id = group.link.strip()
-        # Проверка chat_id
+            group_result = await session.execute(select(Group).where(Group.id == group_id))
+            group = group_result.scalar_one_or_none()
+            buttons_result = await session.execute(select(Button).where(Button.group_id == group_id))
+            buttons = buttons_result.scalars().all()
+            markup = InlineKeyboardMarkup([[InlineKeyboardButton(str(b.name), url=str(b.url))] for b in buttons]) if buttons else None
+            chat_id = getattr(group, 'link', None)
+        if chat_id:
+            chat_id = chat_id.strip()
             if not (chat_id.startswith('@') or chat_id.startswith('-')):
                 await query.edit_message_text('Ошибка: ссылка должна быть username (@channel) или числовой ID (-100...)')
                 return ConversationHandler.END
             try:
-            await context.bot.send_photo(chat_id=chat_id, photo=context.user_data.get('photo'), caption=context.user_data.get('text'), reply_markup=markup)
+                photo = context.user_data.get('photo') if context.user_data else None
+                if photo:
+                    await context.bot.send_photo(chat_id=chat_id, photo=photo, caption=context.user_data.get('text') if context.user_data else None, reply_markup=markup)
                     await query.edit_message_text('Пост отправлен!')
+                else:
+                    await query.edit_message_text('Ошибка: не выбрано фото для поста.')
             except Exception as e:
                 await query.edit_message_text(f'Ошибка отправки поста: {e}')
     finally:
-        session.close()
+        await session.close()
     return ConversationHandler.END
 
 new_post_conv = ConversationHandler(
@@ -69,5 +99,6 @@ new_post_conv = ConversationHandler(
         SELECT_TEXT: [MessageHandler(filters.TEXT | filters.FORWARDED, select_text)],
         SELECT_TARGET: [CallbackQueryHandler(select_target)],
     },
-    fallbacks=[]
+    fallbacks=[],
+    
     )

init_db.py

@@ -0,0 +1,16 @@
+import os
+import asyncio
+from db import init_db
+
+# Проверка bot.db перед инициализацией
+if os.path.exists("bot.db") and os.path.isdir("bot.db"):
+    print("Удаляю папку bot.db...")
+    import shutil
+
+    shutil.rmtree("bot.db")
+if not os.path.exists("bot.db"):
+    print("Создаю пустой файл bot.db...")
+    open("bot.db", "a").close()
+
+if __name__ == "__main__":
+    asyncio.run(init_db())

main.py

@@ -1,36 +1,72 @@
+import sys
+import asyncio
+if sys.platform.startswith('win'):
+    asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 import logging
 import os
 from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import Application, CommandHandler, MessageHandler, filters, CallbackQueryHandler, ConversationHandler, ContextTypes
 from dotenv import load_dotenv
-from db import SessionLocal, init_db
+from db import AsyncSessionLocal, init_db
 from models import Admin, Channel, Group, Button
-
+from asyncio import run as sync_to_async
+from handlers.admin_panel import admin_panel_conv
 load_dotenv()
 TELEGRAM_TOKEN = os.getenv('TELEGRAM_TOKEN')
 
 logging.basicConfig(level=logging.INFO)
+logging.getLogger("httpx").setLevel(logging.WARNING)
 logger = logging.getLogger(__name__)
 
-init_db()
+import asyncio
+
 
 async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    session = SessionLocal()
-    user_id = update.effective_user.id
-    admin = session.query(Admin).filter_by(tg_id=user_id).first()
-    if not admin:
-        admin = Admin(tg_id=user_id)
-        session.add(admin)
-        session.commit()
+    session = AsyncSessionLocal()
+    user_id = update.effective_user.id if update.effective_user else None
+    result = await session.execute(Admin.__table__.select().where(Admin.tg_id == user_id))
+    admin = result.first() if user_id else None
+    if not admin and user_id:
+        await session.execute(Admin.__table__.insert().values(tg_id=user_id))
+        await session.commit()
+        if update.message:
             await update.message.reply_text('Вы зарегистрированы как админ.')
     else:
+        if update.message:
             await update.message.reply_text('Вы уже зарегистрированы.')
-    session.close()
+    await session.close()
 
+async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    help_text = (
+        "<b>Справка по командам бота:</b>\n\n"
+        "<b>/start</b> — регистрация пользователя как администратора.\n"
+        "<b>/help</b> — показать это подробное описание команд.\n\n"
+        "<b>/add_channel &lt;название&gt; &lt;ссылка&gt;</b> — добавить канал для публикаций. Пример: /add_channel MyChannel @my_channel\n"
+        "<b>/add_group &lt;название&gt; &lt;ссылка&gt;</b> — добавить группу для публикаций. Пример: /add_group MyGroup @my_group\n"
+        "<b>/add_button</b> — добавить кнопку к выбранному каналу или группе. Запустит диалог выбора и добавления.\n"
+        "<b>/edit_button &lt;название&gt; &lt;новое_название&gt; &lt;новая_ссылка&gt;</b> — изменить кнопку. Пример: /edit_button old new https://site.ru\n"
+        "<b>/del_button &lt;название&gt;</b> — удалить кнопку по названию.\n"
+        "<b>/new_post</b> — создать новый пост (картинка + текст + выбор канала/группы + кнопки).\n"
+        "<b>/group_buttons</b> — показать и настроить кнопки для группы.\n"
+        "<b>/channel_buttons</b> — показать и настроить кнопки для канала.\n\n"
+        "<b>Примеры использования:</b>\n"
+        "- /add_channel Новости @news_channel\n"
+        "- /add_group Чат @chat_group\n"
+        "- /edit_button Подписка Subscribe https://subscribe.ru\n"
+        "- /del_button Subscribe\n\n"
+        "<b>Порядок работы:</b>\n"
+        "1. Добавьте канал или группу.\n"
+        "2. Добавьте кнопки для них.\n"
+        "3. Создайте пост через /new_post и выберите, куда отправить.\n"
+        "4. Управляйте кнопками через /group_buttons и /channel_buttons.\n\n"
+        "Если возникли вопросы — используйте /help или обратитесь к администратору."
+    )
+    if update.message:
+        await update.message.reply_text(help_text, parse_mode='HTML')
 
 # Импорт обработчиков
-from handlers.add_channel import add_channel
-from handlers.add_group import add_group
+from handlers.add_channel import add_channel_conv
+from handlers.add_group import add_group_conv
 from handlers.add_button import add_button_conv
 from handlers.new_post import new_post_conv
 from handlers.group_buttons import group_buttons_conv
@@ -38,19 +74,36 @@ from handlers.channel_buttons import channel_buttons_conv
 from handlers.edit_button import edit_button
 from handlers.del_button import del_button
 
-def main():
 
+
+def main():
+    if not TELEGRAM_TOKEN:
+        print("Ошибка: TELEGRAM_TOKEN не найден в переменных окружения.")
+        return
+    sync_to_async(init_db())
     application = Application.builder().token(TELEGRAM_TOKEN).build()
     application.add_handler(CommandHandler('start', start))
-    application.add_handler(CommandHandler('add_channel', add_channel))
-    application.add_handler(CommandHandler('add_group', add_group))
+    application.add_handler(CommandHandler('help', help_command))
+    application.add_handler(add_channel_conv)
+    application.add_handler(add_group_conv)
     application.add_handler(add_button_conv)
     application.add_handler(new_post_conv)
     application.add_handler(group_buttons_conv)
     application.add_handler(channel_buttons_conv)
     application.add_handler(CommandHandler('edit_button', edit_button))
     application.add_handler(CommandHandler('del_button', del_button))
+    application.add_handler(admin_panel_conv)
+    import sys
+    import asyncio
+    if sys.platform.startswith('win'):
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
     application.run_polling()
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
+

models.py

@@ -1,7 +1,6 @@
 from sqlalchemy import Column, Integer, String, ForeignKey, Text
-from sqlalchemy.orm import declarative_base, relationship
-
-Base = declarative_base()
+from sqlalchemy.orm import relationship
+from db import Base
 
 class Admin(Base):
     __tablename__ = 'admins'
@@ -11,8 +10,9 @@ class Admin(Base):
 class Channel(Base):
     __tablename__ = 'channels'
     id = Column(Integer, primary_key=True)
-    name = Column(String, nullable=False)
-    link = Column(String, nullable=False)
+    name = Column(String)
+    link = Column(String)
+    admin_id = Column(Integer, ForeignKey('admins.id'))
     buttons = relationship('Button', back_populates='channel')
 
 class Group(Base):
@@ -20,6 +20,7 @@ class Group(Base):
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)
     link = Column(String, nullable=False)
+    admin_id = Column(Integer, ForeignKey('admins.id'))
     buttons = relationship('Button', back_populates='group')
 
 class Button(Base):

requirements.txt

@@ -2,3 +2,5 @@ python-telegram-bot>=20.0
 sqlalchemy>=2.0
 python-dotenv>=1.0
 pytest>=7.0
+aiosqlite
+alembic