FOSS/AutoShop-Djimbo
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: FOSS/AutoShop-Djimbo:main
Branches Tags
FOSS/AutoShop-Djimbo:main Lolz/AutoShop-Wednesday:main
...
compare: Lolz/AutoShop-Wednesday:cb56f6757e81b8d540fc769009eb60a30d617746
Branches Tags
Lolz/AutoShop-Wednesday:main FOSS/AutoShop-Djimbo:main

4 Commits
main ... cb56f6757e

Author SHA1 Message Date
root cb56f6757e Update README.md 2026-07-15 12:03:31 +00:00
root b7cd21bfc3 refactor: remove Yoomoney payment integration 2026-07-15 16:55:53 +05:00
root 572dc8d1b4 refactor(hosting): remove alternative text hosting providers 2026-07-15 16:07:15 +05:00
root ec5ae395f3 refactor: remove Alembic migrations and Discord integration 2026-07-15 15:55:25 +05:00
34 changed files with 798 additions and 2495 deletions
Expand all files Collapse all files
.env.example
-1
View File
@@ -7,4 +7,3 @@ BOT_USER_CACHE_TTL=300
BOT_THROTTLE_RATE=0.5
PATH_DATABASE=tgbot/data/database.db
PATH_LOGS=tgbot/data/logs.log
YOOMONEY_CLIENT_ID=
README.md
+2 -22
View File
@@ -1,4 +1,4 @@
# Telegram Autoshop Bot by Djimbo
# Telegram Autoshop Bot
Telegram bot на `aiogram 3` для магазина с категориями, позициями, товарами, покупками, пополнениями и админкой.
@@ -22,36 +22,16 @@ cp .env.example .env
```env
BOT_TOKEN=
BOT_ADMIN_IDS=
YOOMONEY_CLIENT_ID=
```
Конфигурация читается только из `.env` или переменных окружения.
5. Примени миграции:
```bash
python3 migrate.py up
```
6. Запусти бота:
5. Запусти бота:
```bash
python3 main.py
```
## Миграции
Основные команды:
```bash
python3 migrate.py status
python3 migrate.py up
python3 migrate.py down
python3 migrate.py auto "change description"
```
Схема БД теперь живет в `migrations/`, модели — в `tgbot/database/db_*.py`.
## Docker
```bash
migrate.py
-188
View File
@@ -1,188 +0,0 @@
# - *- coding: utf- 8 - *-
import argparse
from typing import Optional
from alembic import command
from alembic.config import Config
HELP_TEXT = """
Миграции базы данных
Безопасное правило:
python migrate.py только показывает эту справку
действия с БД выполняются только при явной команде
Основные команды:
python migrate.py help показать эту справку
python migrate.py up применить все миграции до head
python migrate.py down откатить последнюю миграцию
python migrate.py new "add users" создать пустую миграцию
python migrate.py auto "add users" создать миграцию по SQLAlchemy-моделям
python migrate.py status показать текущую версию и последние версии
Короткие алиасы:
up -> upgrade
down -> downgrade
new -> revision
auto -> revision --autogenerate
autogen -> auto
cur -> current
hist -> history
st -> status
""".strip()
# Сбор CLI-парсера миграций
def build_parser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser(
description="Удобный CLI для Alembic-миграций",
formatter_class=argparse.RawTextHelpFormatter,
)
subparsers = parser.add_subparsers(dest="command")
help_parser = subparsers.add_parser("help", aliases=["h"], help="Показать понятную справку")
help_parser.set_defaults(action=show_help)
upgrade_parser = subparsers.add_parser("upgrade", aliases=["up"], help="Применить миграции")
upgrade_parser.add_argument("revision", nargs="?", default="head", help="Версия миграции, по умолчанию head")
upgrade_parser.set_defaults(action=run_upgrade)
downgrade_parser = subparsers.add_parser("downgrade", aliases=["down"], help="Откатить миграции")
downgrade_parser.add_argument("revision", nargs="?", default="-1", help="Версия отката, по умолчанию -1")
downgrade_parser.set_defaults(action=run_downgrade)
revision_parser = subparsers.add_parser("revision", aliases=["new"], help="Создать пустую миграцию")
revision_parser.add_argument("message", nargs="?", help="Название миграции")
revision_parser.add_argument("-m", "--message-option", dest="message_option", help="Название миграции")
revision_parser.add_argument("--autogenerate", "-a", action="store_true", help="Собрать изменения из моделей")
revision_parser.set_defaults(action=run_revision)
auto_parser = subparsers.add_parser("auto", aliases=["autogen"], help="Создать миграцию по моделям")
auto_parser.add_argument("message", nargs="?", help="Название миграции")
auto_parser.add_argument("-m", "--message-option", dest="message_option", help="Название миграции")
auto_parser.set_defaults(action=run_auto_revision)
current_parser = subparsers.add_parser("current", aliases=["cur"], help="Показать текущую версию БД")
current_parser.set_defaults(action=run_current)
history_parser = subparsers.add_parser("history", aliases=["hist"], help="Показать историю миграций")
history_parser.set_defaults(action=run_history)
heads_parser = subparsers.add_parser("heads", help="Показать последние версии веток")
heads_parser.set_defaults(action=run_heads)
status_parser = subparsers.add_parser("status", aliases=["st"], help="Показать текущую версию и heads")
status_parser.set_defaults(action=run_status)
return parser
# Просмотр справки по миграциям
def show_help(_config: Optional[Config], _args: argparse.Namespace) -> None:
print(HELP_TEXT)
# Применение миграций до версии
def run_upgrade(config: Config, args: argparse.Namespace) -> None:
print(f"Применяю миграции до версии: {args.revision}")
command.upgrade(config, args.revision)
print("Готово")
# Откат миграции до версии
def run_downgrade(config: Config, args: argparse.Namespace) -> None:
print(f"Откатываю миграции до версии: {args.revision}")
command.downgrade(config, args.revision)
print("Готово")
# Создание пустой миграции
def run_revision(config: Config, args: argparse.Namespace) -> None:
message = get_revision_message(args)
print(f"Создаю миграцию: {message}")
config.attributes["autogenerate_empty"] = False
command.revision(config, message=message, autogenerate=args.autogenerate)
if config.attributes.get("autogenerate_empty"):
print("Изменений в моделях не найдено, файл миграции не создан")
return
print("Готово")
# Создание миграции по моделям
def run_auto_revision(config: Config, args: argparse.Namespace) -> None:
message = get_revision_message(args)
print(f"Создаю миграцию по моделям: {message}")
config.attributes["autogenerate_empty"] = False
command.revision(config, message=message, autogenerate=True)
if config.attributes.get("autogenerate_empty"):
print("Изменений в моделях не найдено, файл миграции не создан")
return
print("Готово")
# Просмотр текущей версии БД
def run_current(config: Config, _args: argparse.Namespace) -> None:
print("Текущая версия БД:")
command.current(config)
# Просмотр истории миграций
def run_history(config: Config, _args: argparse.Namespace) -> None:
print("История миграций:")
command.history(config)
# Просмотр heads миграций
def run_heads(config: Config, _args: argparse.Namespace) -> None:
print("Последние версии миграций:")
command.heads(config)
# Просмотр текущей версии и heads
def run_status(config: Config, args: argparse.Namespace) -> None:
run_current(config, args)
print()
run_heads(config, args)
# Получение названия миграции
def get_revision_message(args: argparse.Namespace) -> str:
message: Optional[str] = args.message_option or args.message
if not message:
raise SystemExit("Укажи название миграции. Пример: python migrate.py auto \"add users\"")
return message
# Получение Alembic-конфига
def get_config() -> Config:
from tgbot.database.migration_runner import get_alembic_config
return get_alembic_config()
# Запуск CLI миграций
def main() -> None:
parser = build_parser()
args = parser.parse_args()
if args.command is None:
show_help(None, args)
return
if args.action == show_help:
show_help(None, args)
return
if args.action in (run_revision, run_auto_revision):
get_revision_message(args)
config = get_config()
args.action(config, args)
if __name__ == "__main__":
main()
migrations/env.py
-184
View File
@@ -1,184 +0,0 @@
# - *- coding: utf- 8 - *-
import asyncio
from logging.config import fileConfig
from typing import Any, List, Optional
from alembic import context
from alembic.operations import ops
from sqlalchemy import pool, text
from sqlalchemy.engine import Connection
from sqlalchemy.schema import DefaultClause
from sqlalchemy.ext.asyncio import async_engine_from_config
from tgbot.database.core import Base
import tgbot.database # noqa: F401
config = context.config
if config.config_file_name is not None:
fileConfig(config.config_file_name)
target_metadata = Base.metadata
INDEX_DIFF_NOISE = {"ix_storage_payments_id", "ix_storage_settings_id"}
# Отбрасывание SQLite-шума из автогенерации
def _filter_autogenerated_ops(container: Any) -> None:
filtered_ops = []
for operation in container.ops:
if isinstance(operation, ops.AlterColumnOp):
continue
if _is_index_noise(operation):
continue
if isinstance(operation, ops.ModifyTableOps):
_filter_autogenerated_ops(operation)
if operation.ops:
filtered_ops.append(operation)
continue
filtered_ops.append(operation)
container.ops = filtered_ops
# Подготовка новых колонок к безопасному SQLite ADD COLUMN
def _prepare_sqlite_add_columns(container: Any) -> None:
for operation in container.ops:
if isinstance(operation, ops.AddColumnOp):
_apply_server_default(operation.column)
continue
if isinstance(operation, ops.ModifyTableOps):
_prepare_sqlite_add_columns(operation)
# Перенос default модели в server_default миграции
def _apply_server_default(column: Any) -> None:
if column.nullable or column.server_default is not None or column.default is None:
return
default_value = _get_simple_default(column.default.arg)
if default_value is None:
return
column.server_default = DefaultClause(text(default_value))
# Получение SQL-литерала для простых default-значений
def _get_simple_default(value: Any) -> Optional[str]:
if callable(value):
return None
if isinstance(value, bool):
return "1" if value else "0"
if isinstance(value, (int, float)):
return str(value)
if isinstance(value, str):
return repr(value)
return None
# Игнорирование индексов, которые SQLite отражает иначе
def _is_index_noise(operation: Any) -> bool:
if not isinstance(operation, (ops.CreateIndexOp, ops.DropIndexOp)):
return False
return getattr(operation, "index_name", "") in INDEX_DIFF_NOISE
# Ограничение сравнения SQLite только реальными добавлениями/удалениями
def _include_object(object_: Any, name: str, type_: str, reflected: bool, compare_to: Any) -> bool:
if type_ == "column" and compare_to is not None:
return False
if type_ == "index" and name in INDEX_DIFF_NOISE:
return False
return True
# Очистка автосозданной миграции перед записью
def _process_revision_directives(_context: Any, _revision: Any, directives: List[Any]) -> None:
if not directives:
return
script = directives[0]
_prepare_sqlite_add_columns(script.upgrade_ops)
_filter_autogenerated_ops(script.upgrade_ops)
_filter_autogenerated_ops(script.downgrade_ops)
if not script.upgrade_ops.ops and not script.downgrade_ops.ops:
config.attributes["autogenerate_empty"] = True
directives.clear()
# Запуск миграций без подключения
def run_migrations_offline() -> None:
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
render_as_batch=True,
compare_type=False,
include_object=_include_object,
process_revision_directives=_process_revision_directives,
)
with context.begin_transaction():
context.run_migrations()
# Запуск миграций на соединении
def do_run_migrations(connection: Connection) -> None:
context.configure(
connection=connection,
target_metadata=target_metadata,
render_as_batch=True,
compare_type=False,
include_object=_include_object,
process_revision_directives=_process_revision_directives,
)
with context.begin_transaction():
context.run_migrations()
# Запуск миграций через async-engine
async def run_async_migrations() -> None:
connectable = async_engine_from_config(
config.get_section(config.config_ini_section, {}),
poolclass=pool.NullPool,
)
connection = connectable.connect()
try:
await connection.start()
await connection.run_sync(do_run_migrations)
finally:
await connection.close()
await connectable.dispose()
if context.is_offline_mode():
run_migrations_offline()
else:
external_connection = config.attributes.get("connection")
if external_connection is not None:
do_run_migrations(external_connection)
else:
asyncio.run(run_async_migrations())
migrations/script.py.mako
-24
View File
@@ -1,24 +0,0 @@
"""${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: str = ${repr(up_revision)}
down_revision: Union[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:
${upgrades if upgrades else "pass"}
def downgrade() -> None:
${downgrades if downgrades else "pass"}
migrations/versions/20260529_0001_shop_schema.py
-515
View File
@@ -1,515 +0,0 @@
"""Начальная схема Телеграм-магазина
Revision ID: 0001_shop_schema
Revises:
Create Date: 2026-05-29 00:00:00
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = "0001_shop_schema"
down_revision: Union[str, None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
# Проверка наличия таблицы
def _table_exists(table_name: str) -> bool:
bind = op.get_bind()
result = bind.execute(
sa.text(
"""
SELECT name
FROM sqlite_master
WHERE type = 'table'
AND name = :table_name
"""
),
{"table_name": table_name},
)
return result.scalar_one_or_none() is not None
# Проверка наличия колонки
def _column_exists(table_name: str, column_name: str) -> bool:
bind = op.get_bind()
result = bind.execute(sa.text(f"PRAGMA table_info({table_name})"))
return column_name in [row.name for row in result]
# Добавление колонки, если ее нет
def _add_column(table_name: str, column_name: str, column_sql: str) -> None:
if not _column_exists(table_name, column_name):
op.execute(sa.text(f"ALTER TABLE {table_name} ADD COLUMN {column_name} {column_sql}"))
# Создание индекса, если его нет
def _create_index(index_name: str, table_name: str, columns: str, *, unique: bool = False) -> None:
unique_sql = "UNIQUE " if unique else ""
op.execute(sa.text(f"CREATE {unique_sql}INDEX IF NOT EXISTS {index_name} ON {table_name} ({columns})"))
# Нормализация текстовых bool-значений
def _normalize_boolean_text(table_name: str, column_name: str, default_value: str) -> None:
bind = op.get_bind()
bind.execute(
sa.text(
f"""
UPDATE {table_name}
SET {column_name} = CASE LOWER(CAST(COALESCE({column_name}, :default_value) AS TEXT))
WHEN '1' THEN 'True'
WHEN 'true' THEN 'True'
WHEN 'yes' THEN 'True'
WHEN 'on' THEN 'True'
WHEN 'да' THEN 'True'
WHEN '0' THEN 'False'
WHEN 'false' THEN 'False'
WHEN 'no' THEN 'False'
WHEN 'off' THEN 'False'
WHEN 'нет' THEN 'False'
ELSE :default_value
END
"""
),
{"default_value": default_value},
)
# Сбор SQL для переноса текстовой колонки
def _copy_expr(table_name: str, column_name: str, default_value: str) -> str:
if _column_exists(table_name, column_name):
return f"COALESCE({column_name}, '{default_value}')"
return f"'{default_value}'"
# Сбор SQL для переноса числовой колонки
def _copy_int_expr(table_name: str, column_name: str, default_value: int = 0) -> str:
if _column_exists(table_name, column_name):
return f"COALESCE({column_name}, {default_value})"
return str(default_value)
# Создание или правка таблицы пользователей
def _ensure_users() -> None:
bind = op.get_bind()
if not _table_exists("storage_users"):
op.create_table(
"storage_users",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("user_id", sa.BigInteger(), nullable=False),
sa.Column("user_login", sa.String(length=255), nullable=False, server_default=""),
sa.Column("user_name", sa.String(length=255), nullable=False, server_default=""),
sa.Column("user_surname", sa.String(length=255), nullable=False, server_default=""),
sa.Column("user_fullname", sa.String(length=511), nullable=False, server_default=""),
sa.Column("user_balance", sa.Float(), nullable=False, server_default="0"),
sa.Column("user_refill", sa.Float(), nullable=False, server_default="0"),
sa.Column("user_give", sa.Float(), nullable=False, server_default="0"),
sa.Column("user_unix", sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_users", "user_login", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_users", "user_name", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_users", "user_surname", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_users", "user_fullname", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_users", "user_balance", "REAL NOT NULL DEFAULT 0")
_add_column("storage_users", "user_refill", "REAL NOT NULL DEFAULT 0")
_add_column("storage_users", "user_give", "REAL NOT NULL DEFAULT 0")
_add_column("storage_users", "user_unix", "INTEGER NOT NULL DEFAULT 0")
bind.execute(sa.text("UPDATE storage_users SET user_login = COALESCE(user_login, '')"))
bind.execute(sa.text("UPDATE storage_users SET user_name = COALESCE(user_name, '')"))
bind.execute(sa.text("UPDATE storage_users SET user_surname = COALESCE(user_surname, '')"))
bind.execute(
sa.text(
"""
UPDATE storage_users
SET user_fullname = CASE
WHEN user_fullname IS NULL OR user_fullname = '' THEN TRIM(user_name || ' ' || user_surname)
ELSE user_fullname
END
"""
)
)
bind.execute(sa.text("UPDATE storage_users SET user_balance = COALESCE(user_balance, 0)"))
bind.execute(sa.text("UPDATE storage_users SET user_refill = COALESCE(user_refill, 0)"))
bind.execute(sa.text("UPDATE storage_users SET user_give = COALESCE(user_give, 0)"))
bind.execute(sa.text("UPDATE storage_users SET user_unix = COALESCE(user_unix, 0)"))
bind.execute(sa.text("DELETE FROM storage_users WHERE user_id IS NULL"))
bind.execute(
sa.text(
"""
DELETE
FROM storage_users
WHERE user_id IS NOT NULL
AND rowid NOT IN (
SELECT MAX(rowid)
FROM storage_users
WHERE user_id IS NOT NULL
GROUP BY user_id
)
"""
)
)
_create_index("ix_storage_users_user_id", "storage_users", "user_id", unique=True)
# Создание или правка таблицы настроек
def _ensure_settings() -> None:
bind = op.get_bind()
if not _table_exists("storage_settings"):
op.create_table(
"storage_settings",
sa.Column("id", sa.Integer(), nullable=False),
sa.Column("status_work", sa.String(length=16), nullable=False, server_default="True"),
sa.Column("status_refill", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("status_buy", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("notification_refill", sa.String(length=16), nullable=False, server_default="True"),
sa.Column("notification_buy", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_faq", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_support", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_bot", sa.String(length=255), nullable=False, server_default="None"),
sa.Column("misc_hosting_text", sa.String(length=64), nullable=False, server_default="telegraph"),
sa.Column("misc_token_telegraph", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_discord_webhook_url", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_discord_webhook_name", sa.String(length=255), nullable=False, server_default="None"),
sa.Column("misc_hide_category", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_hide_position", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_profit_day", sa.Integer(), nullable=False, server_default="0"),
sa.Column("misc_profit_week", sa.Integer(), nullable=False, server_default="0"),
sa.Column("misc_profit_month", sa.Integer(), nullable=False, server_default="0"),
sa.PrimaryKeyConstraint("id"),
)
else:
bind.execute(sa.text("DROP TABLE IF EXISTS storage_settings_new"))
op.create_table(
"storage_settings_new",
sa.Column("id", sa.Integer(), nullable=False),
sa.Column("status_work", sa.String(length=16), nullable=False, server_default="True"),
sa.Column("status_refill", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("status_buy", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("notification_refill", sa.String(length=16), nullable=False, server_default="True"),
sa.Column("notification_buy", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_faq", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_support", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_bot", sa.String(length=255), nullable=False, server_default="None"),
sa.Column("misc_hosting_text", sa.String(length=64), nullable=False, server_default="telegraph"),
sa.Column("misc_token_telegraph", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_discord_webhook_url", sa.String(), nullable=False, server_default="None"),
sa.Column("misc_discord_webhook_name", sa.String(length=255), nullable=False, server_default="None"),
sa.Column("misc_hide_category", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_hide_position", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("misc_profit_day", sa.Integer(), nullable=False, server_default="0"),
sa.Column("misc_profit_week", sa.Integer(), nullable=False, server_default="0"),
sa.Column("misc_profit_month", sa.Integer(), nullable=False, server_default="0"),
sa.PrimaryKeyConstraint("id"),
)
bind.execute(
sa.text(
f"""
INSERT INTO storage_settings_new (
id,
status_work,
status_refill,
status_buy,
notification_refill,
notification_buy,
misc_faq,
misc_support,
misc_bot,
misc_hosting_text,
misc_token_telegraph,
misc_discord_webhook_url,
misc_discord_webhook_name,
misc_hide_category,
misc_hide_position,
misc_profit_day,
misc_profit_week,
misc_profit_month
)
SELECT
1,
{_copy_expr("storage_settings", "status_work", "True")},
{_copy_expr("storage_settings", "status_refill", "False")},
{_copy_expr("storage_settings", "status_buy", "False")},
{_copy_expr("storage_settings", "notification_refill", "True")},
{_copy_expr("storage_settings", "notification_buy", "False")},
{_copy_expr("storage_settings", "misc_faq", "None")},
{_copy_expr("storage_settings", "misc_support", "None")},
{_copy_expr("storage_settings", "misc_bot", "None")},
{_copy_expr("storage_settings", "misc_hosting_text", "telegraph")},
{_copy_expr("storage_settings", "misc_token_telegraph", "None")},
{_copy_expr("storage_settings", "misc_discord_webhook_url", "None")},
{_copy_expr("storage_settings", "misc_discord_webhook_name", "None")},
{_copy_expr("storage_settings", "misc_hide_category", "False")},
{_copy_expr("storage_settings", "misc_hide_position", "False")},
{_copy_int_expr("storage_settings", "misc_profit_day")},
{_copy_int_expr("storage_settings", "misc_profit_week")},
{_copy_int_expr("storage_settings", "misc_profit_month")}
FROM storage_settings
LIMIT 1
"""
)
)
bind.execute(sa.text("DROP TABLE storage_settings"))
bind.execute(sa.text("ALTER TABLE storage_settings_new RENAME TO storage_settings"))
bind.execute(
sa.text(
"""
INSERT INTO storage_settings (id)
SELECT 1
WHERE NOT EXISTS (SELECT 1 FROM storage_settings WHERE id = 1)
"""
)
)
for column, default in (
("status_work", "True"),
("status_refill", "False"),
("status_buy", "False"),
("notification_refill", "True"),
("notification_buy", "False"),
("misc_hide_category", "False"),
("misc_hide_position", "False"),
):
_normalize_boolean_text("storage_settings", column, default)
_create_index("ix_storage_settings_id", "storage_settings", "id", unique=True)
# Создание или правка таблицы платежей
def _ensure_payments() -> None:
bind = op.get_bind()
if not _table_exists("storage_payments"):
op.create_table(
"storage_payments",
sa.Column("id", sa.Integer(), nullable=False),
sa.Column("cryptobot_token", sa.String(), nullable=False, server_default="None"),
sa.Column("yoomoney_token", sa.String(), nullable=False, server_default="None"),
sa.Column("status_cryptobot", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("status_yoomoney", sa.String(length=16), nullable=False, server_default="False"),
sa.PrimaryKeyConstraint("id"),
)
else:
bind.execute(sa.text("DROP TABLE IF EXISTS storage_payments_new"))
op.create_table(
"storage_payments_new",
sa.Column("id", sa.Integer(), nullable=False),
sa.Column("cryptobot_token", sa.String(), nullable=False, server_default="None"),
sa.Column("yoomoney_token", sa.String(), nullable=False, server_default="None"),
sa.Column("status_cryptobot", sa.String(length=16), nullable=False, server_default="False"),
sa.Column("status_yoomoney", sa.String(length=16), nullable=False, server_default="False"),
sa.PrimaryKeyConstraint("id"),
)
bind.execute(
sa.text(
f"""
INSERT INTO storage_payments_new (
id,
cryptobot_token,
yoomoney_token,
status_cryptobot,
status_yoomoney
)
SELECT
1,
{_copy_expr("storage_payments", "cryptobot_token", "None")},
{_copy_expr("storage_payments", "yoomoney_token", "None")},
{_copy_expr("storage_payments", "status_cryptobot", "False")},
{_copy_expr("storage_payments", "status_yoomoney", "False")}
FROM storage_payments
LIMIT 1
"""
)
)
bind.execute(sa.text("DROP TABLE storage_payments"))
bind.execute(sa.text("ALTER TABLE storage_payments_new RENAME TO storage_payments"))
bind.execute(
sa.text(
"""
INSERT INTO storage_payments (id)
SELECT 1
WHERE NOT EXISTS (SELECT 1 FROM storage_payments WHERE id = 1)
"""
)
)
_normalize_boolean_text("storage_payments", "status_cryptobot", "False")
_normalize_boolean_text("storage_payments", "status_yoomoney", "False")
_create_index("ix_storage_payments_id", "storage_payments", "id", unique=True)
# Создание или правка таблицы категорий
def _ensure_category() -> None:
if not _table_exists("storage_category"):
op.create_table(
"storage_category",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("category_id", sa.BigInteger(), nullable=False),
sa.Column("category_name", sa.String(length=255), nullable=False),
sa.Column("category_unix", sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_category", "category_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_category", "category_name", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_category", "category_unix", "INTEGER NOT NULL DEFAULT 0")
_create_index("ix_storage_category_category_id", "storage_category", "category_id")
# Создание или правка таблицы позиций
def _ensure_position() -> None:
if not _table_exists("storage_position"):
op.create_table(
"storage_position",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("category_id", sa.BigInteger(), nullable=False),
sa.Column("position_id", sa.BigInteger(), nullable=False),
sa.Column("position_name", sa.String(length=255), nullable=False),
sa.Column("position_price", sa.Float(), nullable=False, server_default="0"),
sa.Column("position_desc", sa.Text(), nullable=False, server_default="None"),
sa.Column("position_photo", sa.Text(), nullable=False, server_default="None"),
sa.Column("position_unix", sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_position", "category_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_position", "position_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_position", "position_name", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_position", "position_price", "REAL NOT NULL DEFAULT 0")
_add_column("storage_position", "position_desc", "TEXT NOT NULL DEFAULT 'None'")
_add_column("storage_position", "position_photo", "TEXT NOT NULL DEFAULT 'None'")
_add_column("storage_position", "position_unix", "INTEGER NOT NULL DEFAULT 0")
_create_index("ix_storage_position_category_id", "storage_position", "category_id")
_create_index("ix_storage_position_position_id", "storage_position", "position_id")
# Создание или правка таблицы товаров
def _ensure_item() -> None:
if not _table_exists("storage_item"):
op.create_table(
"storage_item",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("user_id", sa.BigInteger(), nullable=False),
sa.Column("category_id", sa.BigInteger(), nullable=False),
sa.Column("position_id", sa.BigInteger(), nullable=False),
sa.Column("item_id", sa.BigInteger(), nullable=False),
sa.Column("item_unix", sa.Integer(), nullable=False),
sa.Column("item_data", sa.Text(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_item", "user_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_item", "category_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_item", "position_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_item", "item_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_item", "item_unix", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_item", "item_data", "TEXT NOT NULL DEFAULT ''")
_create_index("ix_storage_item_user_id", "storage_item", "user_id")
_create_index("ix_storage_item_category_id", "storage_item", "category_id")
_create_index("ix_storage_item_position_id", "storage_item", "position_id")
_create_index("ix_storage_item_item_id", "storage_item", "item_id")
# Создание или правка таблицы покупок
def _ensure_purchases() -> None:
if not _table_exists("storage_purchases"):
op.create_table(
"storage_purchases",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("user_id", sa.BigInteger(), nullable=False),
sa.Column("user_balance_before", sa.Float(), nullable=False, server_default="0"),
sa.Column("user_balance_after", sa.Float(), nullable=False, server_default="0"),
sa.Column("purchase_receipt", sa.BigInteger(), nullable=False),
sa.Column("purchase_data", sa.Text(), nullable=False),
sa.Column("purchase_count", sa.Integer(), nullable=False, server_default="1"),
sa.Column("purchase_price", sa.Float(), nullable=False, server_default="0"),
sa.Column("purchase_price_one", sa.Float(), nullable=False, server_default="0"),
sa.Column("purchase_position_id", sa.BigInteger(), nullable=False),
sa.Column("purchase_position_name", sa.String(length=255), nullable=False),
sa.Column("purchase_category_id", sa.BigInteger(), nullable=False),
sa.Column("purchase_category_name", sa.String(length=255), nullable=False),
sa.Column("purchase_unix", sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_purchases", "user_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_purchases", "user_balance_before", "REAL NOT NULL DEFAULT 0")
_add_column("storage_purchases", "user_balance_after", "REAL NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_receipt", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_data", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_purchases", "purchase_count", "INTEGER NOT NULL DEFAULT 1")
_add_column("storage_purchases", "purchase_price", "REAL NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_price_one", "REAL NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_position_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_position_name", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_purchases", "purchase_category_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_purchases", "purchase_category_name", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_purchases", "purchase_unix", "INTEGER NOT NULL DEFAULT 0")
_create_index("ix_storage_purchases_user_id", "storage_purchases", "user_id")
_create_index("ix_storage_purchases_purchase_receipt", "storage_purchases", "purchase_receipt")
_create_index("ix_storage_purchases_purchase_position_id", "storage_purchases", "purchase_position_id")
_create_index("ix_storage_purchases_purchase_category_id", "storage_purchases", "purchase_category_id")
# Создание или правка таблицы пополнений
def _ensure_refill() -> None:
if not _table_exists("storage_refill"):
op.create_table(
"storage_refill",
sa.Column("increment", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("user_id", sa.BigInteger(), nullable=False),
sa.Column("refill_receipt", sa.BigInteger(), nullable=False),
sa.Column("refill_comment", sa.String(length=255), nullable=False, server_default=""),
sa.Column("refill_amount", sa.Float(), nullable=False, server_default="0"),
sa.Column("refill_method", sa.String(length=64), nullable=False),
sa.Column("refill_unix", sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint("increment"),
)
else:
_add_column("storage_refill", "user_id", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_refill", "refill_receipt", "INTEGER NOT NULL DEFAULT 0")
_add_column("storage_refill", "refill_comment", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_refill", "refill_amount", "REAL NOT NULL DEFAULT 0")
_add_column("storage_refill", "refill_method", "TEXT NOT NULL DEFAULT ''")
_add_column("storage_refill", "refill_unix", "INTEGER NOT NULL DEFAULT 0")
_create_index("ix_storage_refill_user_id", "storage_refill", "user_id")
_create_index("ix_storage_refill_refill_receipt", "storage_refill", "refill_receipt")
# Применение начальной схемы магазина
def upgrade() -> None:
_ensure_users()
_ensure_settings()
_ensure_payments()
_ensure_category()
_ensure_position()
_ensure_item()
_ensure_purchases()
_ensure_refill()
# Откат начальной схемы магазина
def downgrade() -> None:
op.drop_table("storage_refill")
op.drop_table("storage_purchases")
op.drop_table("storage_item")
op.drop_table("storage_position")
op.drop_table("storage_category")
op.drop_table("storage_payments")
op.drop_table("storage_settings")
op.drop_table("storage_users")
migrations/versions/20260530_1915_492769059249_add_column_status_stars_into_storage_.py
-32
View File
@@ -1,32 +0,0 @@
"""add column 'status_stars' into storage_payments
Revision ID: 492769059249
Revises: 0001_shop_schema
Create Date: 2026-05-30 19:15:00.214301+03:00
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = '492769059249'
down_revision: Union[str, None] = '0001_shop_schema'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_payments', schema=None) as batch_op:
batch_op.add_column(sa.Column('status_stars', sa.String(length=16), server_default=sa.text("'False'"), nullable=False))
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_payments', schema=None) as batch_op:
batch_op.drop_column('status_stars')
# ### end Alembic commands ###
migrations/versions/20260530_1928_700275128e27_add_column_stars_course_into_storage_.py
-32
View File
@@ -1,32 +0,0 @@
"""add column 'stars_course' into storage_payment
Revision ID: 700275128e27
Revises: 492769059249
Create Date: 2026-05-30 19:28:42.490458+03:00
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = '700275128e27'
down_revision: Union[str, None] = '492769059249'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_payments', schema=None) as batch_op:
batch_op.add_column(sa.Column('stars_course', sa.Float(), server_default=sa.text('(1.5)'), nullable=False))
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_payments', schema=None) as batch_op:
batch_op.drop_column('stars_course')
# ### end Alembic commands ###
migrations/versions/20260601_1934_36380377b0e6_add_column_misc_method_prod_into_.py
-32
View File
@@ -1,32 +0,0 @@
"""add column 'misc_method_prod' into 'storage_settings'
Revision ID: 36380377b0e6
Revises: 700275128e27
Create Date: 2026-06-01 19:34:35.858117+03:00
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
revision: str = '36380377b0e6'
down_revision: Union[str, None] = '700275128e27'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_settings', schema=None) as batch_op:
batch_op.add_column(sa.Column('misc_method_prod', sa.String(length=16), server_default=sa.text("'skip'"), nullable=False))
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('storage_settings', schema=None) as batch_op:
batch_op.drop_column('misc_method_prod')
# ### end Alembic commands ###
pyproject.toml
-1
View File
@@ -28,4 +28,3 @@ dependencies = [
[tool.setuptools.packages.find]
include = ["tgbot*"]
exclude = ["migrations*"]
tgbot/data/config.py
+34 -12
View File
@@ -28,16 +28,29 @@ class Settings(BaseSettings):
default=True,
validation_alias="BOT_DATABASE_EXPORT",
)
status_notification: bool = Field(default=True, validation_alias="BOT_STATUS_NOTIFICATION")
status_notification: bool = Field(
default=True, validation_alias="BOT_STATUS_NOTIFICATION"
)
timezone: str = Field(default="Europe/Moscow", validation_alias="BOT_TIMEZONE")
database_path: str = Field(default="tgbot/data/database.db", validation_alias="PATH_DATABASE")
database_path: str = Field(
default="tgbot/data/database.db", validation_alias="PATH_DATABASE"
)
logs_path: str = Field(default="tgbot/data/logs.log", validation_alias="PATH_LOGS")
user_cache_ttl: int = Field(default=300, ge=0, validation_alias="BOT_USER_CACHE_TTL")
throttle_rate: float = Field(default=0.5, ge=0, validation_alias="BOT_THROTTLE_RATE")
yoomoney_client_id: str = Field(default="", validation_alias="YOOMONEY_CLIENT_ID")
user_cache_ttl: int = Field(
default=300, ge=0, validation_alias="BOT_USER_CACHE_TTL"
)
throttle_rate: float = Field(
default=0.5, ge=0, validation_alias="BOT_THROTTLE_RATE"
)
# Очистка строковых значений из окружения
@field_validator("bot_token", "timezone", "database_path", "logs_path", "yoomoney_client_id", mode="before")
@field_validator(
"bot_token",
"timezone",
"database_path",
"logs_path",
mode="before",
)
@classmethod
def _strip_string(cls, value: object) -> str:
return str(value or "").strip()
@@ -52,11 +65,15 @@ class Settings(BaseSettings):
if isinstance(value, int):
values = [value]
elif isinstance(value, str):
values = [admin_id for admin_id in value.replace(" ", "").split(",") if admin_id]
values = [
admin_id for admin_id in value.replace(" ", "").split(",") if admin_id
]
elif isinstance(value, (list, tuple, set)):
values = list(value)
else:
raise ValueError("BOT_ADMIN_IDS должен быть числом или списком чисел через запятую")
raise ValueError(
"BOT_ADMIN_IDS должен быть числом или списком чисел через запятую"
)
admin_ids = []
@@ -64,10 +81,14 @@ class Settings(BaseSettings):
try:
parsed_id = int(admin_id)
except (TypeError, ValueError) as error:
raise ValueError("BOT_ADMIN_IDS должен содержать только Телеграм ID через запятую") from error
raise ValueError(
"BOT_ADMIN_IDS должен содержать только Телеграм ID через запятую"
) from error
if parsed_id <= 0:
raise ValueError("BOT_ADMIN_IDS должен содержать Телеграм ID больше нуля")
raise ValueError(
"BOT_ADMIN_IDS должен содержать Телеграм ID больше нуля"
)
admin_ids.append(parsed_id)
@@ -80,7 +101,9 @@ class Settings(BaseSettings):
try:
timezone(value)
except UnknownTimeZoneError as error:
raise ValueError("BOT_TIMEZONE должен быть корректной временной зоной, например Europe/Moscow") from error
raise ValueError(
"BOT_TIMEZONE должен быть корректной временной зоной, например Europe/Moscow"
) from error
return value
@@ -126,7 +149,6 @@ BOT_DATABASE_EXPORT = settings.database_export
BOT_TIMEZONE = settings.timezone
BOT_USER_CACHE_TTL = settings.user_cache_ttl
BOT_THROTTLE_RATE = settings.throttle_rate
YOOMONEY_CLIENT_ID = settings.yoomoney_client_id
BOT_SCHEDULER = AsyncIOScheduler(timezone=BOT_TIMEZONE)
BOT_VERSION = 4.2
tgbot/database/db_payments.py
+6 -4
View File
@@ -14,11 +14,13 @@ class PaymentsModel(Base):
id: Mapped[int] = mapped_column(Integer, primary_key=True, default=1)
cryptobot_token: Mapped[str] = mapped_column(String, nullable=False, default="None")
yoomoney_token: Mapped[str] = mapped_column(String, nullable=False, default="None")
stars_course: Mapped[float] = mapped_column(Float, nullable=False, default=1.5)
status_cryptobot: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
status_yoomoney: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
status_stars: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
status_cryptobot: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
status_stars: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
ModelBase = Payments
tgbot/database/db_position.py
+23 -17
View File
@@ -13,14 +13,17 @@ from tgbot.utils.const_functions import get_unix
class PositionModel(Base):
__tablename__ = "storage_position"
increment: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
increment: Mapped[int] = mapped_column(
Integer, primary_key=True, autoincrement=True
)
category_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True)
position_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True)
position_name: Mapped[str] = mapped_column(String(255), nullable=False)
position_price: Mapped[float] = mapped_column(Float, nullable=False, default=0)
position_desc: Mapped[str] = mapped_column(Text, nullable=False, default="None")
position_photo: Mapped[str] = mapped_column(Text, nullable=False, default="None")
position_unix: Mapped[int] = mapped_column(Integer, nullable=False, default=get_unix)
position_unix: Mapped[int] = mapped_column(
Integer, nullable=False, default=get_unix
)
ModelBase = Position
@@ -37,13 +40,12 @@ class Positionx(BaseRepository[PositionModel, Position]):
# Добавление позиции товара
async def add(
self,
category_id: int,
position_id: int,
position_name: str,
position_price: float,
position_desc: str,
position_photo: str,
self,
category_id: int,
position_id: int,
position_name: str,
position_price: float,
position_desc: str,
) -> Position:
return await self._insert(
category_id=category_id,
@@ -51,12 +53,13 @@ class Positionx(BaseRepository[PositionModel, Position]):
position_name=position_name,
position_price=position_price,
position_desc=position_desc,
position_photo=position_photo,
position_unix=get_unix(),
)
# Обновление позиции по ID или фильтру
async def update(self, where: Optional[Union[Dict[str, Any], int]] = None, **kwargs) -> int:
async def update(
self, where: Optional[Union[Dict[str, Any], int]] = None, **kwargs
) -> int:
if isinstance(where, int):
where = {"position_id": where}
@@ -68,12 +71,15 @@ class Positionx(BaseRepository[PositionModel, Position]):
from tgbot.database.db_item import ItemModel
item_table = ItemModel.__table__
statement = (
select(item_table.c.position_id, func.count(item_table.c.increment).label("item_count"))
.group_by(item_table.c.position_id)
)
statement = select(
item_table.c.position_id,
func.count(item_table.c.increment).label("item_count"),
).group_by(item_table.c.position_id)
async with session_scope() as session:
rows = await session.execute(statement)
return {int(position_id): int(item_count) for position_id, item_count in rows.all()}
return {
int(position_id): int(item_count)
for position_id, item_count in rows.all()
}
tgbot/database/db_settings.py
+24 -10
View File
@@ -14,20 +14,34 @@ class SettingsModel(Base):
id: Mapped[int] = mapped_column(Integer, primary_key=True, default=1)
status_work: Mapped[str] = mapped_column(String(16), nullable=False, default="True")
status_refill: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
status_refill: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
status_buy: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
notification_refill: Mapped[str] = mapped_column(String(16), nullable=False, default="True")
notification_buy: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
notification_refill: Mapped[str] = mapped_column(
String(16), nullable=False, default="True"
)
notification_buy: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
misc_faq: Mapped[str] = mapped_column(String, nullable=False, default="None")
misc_support: Mapped[str] = mapped_column(String, nullable=False, default="None")
misc_bot: Mapped[str] = mapped_column(String(255), nullable=False, default="None")
misc_hosting_text: Mapped[str] = mapped_column(String(64), nullable=False, default="telegraph")
misc_token_telegraph: Mapped[str] = mapped_column(String, nullable=False, default="None")
misc_discord_webhook_url: Mapped[str] = mapped_column(String, nullable=False, default="None")
misc_discord_webhook_name: Mapped[str] = mapped_column(String(255), nullable=False, default="None")
misc_hide_category: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
misc_hide_position: Mapped[str] = mapped_column(String(16), nullable=False, default="False")
misc_method_prod: Mapped[str] = mapped_column(String(16), nullable=False, default="skip")
misc_hosting_text: Mapped[str] = mapped_column(
String(64), nullable=False, default="telegraph"
)
misc_token_telegraph: Mapped[str] = mapped_column(
String, nullable=False, default="None"
)
misc_hide_category: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
misc_hide_position: Mapped[str] = mapped_column(
String(16), nullable=False, default="False"
)
misc_method_prod: Mapped[str] = mapped_column(
String(16), nullable=False, default="skip"
)
misc_profit_day: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
misc_profit_week: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
misc_profit_month: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
tgbot/database/entities.py
-5
View File
@@ -18,7 +18,6 @@ class Position:
position_name: str
position_price: float
position_desc: str
position_photo: str
position_unix: int
@@ -37,10 +36,8 @@ class Item:
class Payments:
id: int
cryptobot_token: str
yoomoney_token: str
stars_course: float
status_cryptobot: str
status_yoomoney: str
status_stars: str
@@ -86,8 +83,6 @@ class Settings:
misc_bot: str
misc_hosting_text: str
misc_token_telegraph: str
misc_discord_webhook_url: str
misc_discord_webhook_name: str
misc_hide_category: str
misc_hide_position: str
misc_method_prod: str
tgbot/database/migration_runner.py
-2
View File
@@ -12,13 +12,11 @@ from tgbot.database.core import database_url
PROJECT_ROOT = Path(__file__).resolve().parents[2]
ALEMBIC_INI = PROJECT_ROOT / "alembic.ini"
MIGRATIONS_DIR = PROJECT_ROOT / "migrations"
# Сбор Alembic-конфига от корня проекта
def get_alembic_config(url: str = database_url) -> Config:
config = Config(str(ALEMBIC_INI))
config.set_main_option("script_location", str(MIGRATIONS_DIR))
config.set_main_option("sqlalchemy.url", url)
return config
tgbot/database/repository.py
+14 -3
View File
@@ -5,8 +5,7 @@ from typing import Any, Dict, Generic, List, Optional, Type, TypeVar
from sqlalchemy import delete as sqlalchemy_delete
from sqlalchemy import select
from sqlalchemy import update as sqlalchemy_update
from tgbot.database.core import Base, database_path, session_scope
from tgbot.database.migration_runner import run_migrations
from tgbot.database.core import Base, database_path, engine, session_scope
from tgbot.utils.misc.bot_logging import bot_logger
ModelTranslator = TypeVar("ModelTranslator", bound=Base)
@@ -151,7 +150,19 @@ class BaseRepository(Generic[ModelTranslator, EntityTranslator]):
# Применение миграций и создание дефолтных строк
async def prepare_database() -> None:
database_path.parent.mkdir(parents=True, exist_ok=True)
await run_migrations()
# Импорт всех моделей до create_all, чтобы они зарегистрировались в Base.metadata
import tgbot.database.db_category # noqa: F401
import tgbot.database.db_item # noqa: F401
import tgbot.database.db_payments # noqa: F401
import tgbot.database.db_position # noqa: F401
import tgbot.database.db_purchases # noqa: F401
import tgbot.database.db_refill # noqa: F401
import tgbot.database.db_settings # noqa: F401
import tgbot.database.db_users # noqa: F401
async with engine.begin() as conn:
await conn.run_sync(Base.metadata.create_all)
from tgbot.database.db_payments import Paymentsx
from tgbot.database.db_settings import Settingsx
tgbot/keyboards/inline_admin.py
+43 -61
View File
@@ -73,9 +73,15 @@ async def payment_cryptobot_finl() -> InlineKeyboardMarkup:
assets_symbol = "➕"
if get_payments.status_cryptobot == "True":
status_kb = ikb(f"{assets_symbol} | Статус: Включено ✅", data="payment_cryptobot_status:False")
status_kb = ikb(
f"{assets_symbol} | Статус: Включено ✅",
data="payment_cryptobot_status:False",
)
else:
status_kb = ikb(f"{assets_symbol} | Статус: Выключено ❌", data="payment_cryptobot_status:True")
status_kb = ikb(
f"{assets_symbol} | Статус: Выключено ❌",
data="payment_cryptobot_status:True",
)
keyboard.row(
ikb("Информация ♻️", data="payment_cryptobot_check"),
@@ -92,37 +98,6 @@ async def payment_cryptobot_finl() -> InlineKeyboardMarkup:
return keyboard.as_markup()
# Управление - ЮMoney
async def payment_yoomoney_finl() -> InlineKeyboardMarkup:
keyboard = InlineKeyboardBuilder()
get_payments = await Paymentsx().get()
if get_payments.yoomoney_token == "None":
assets_symbol = "➖"
else:
assets_symbol = "➕"
if get_payments.status_yoomoney == "True":
status_kb = ikb(f"{assets_symbol} | Статус: Включено ✅", data="payment_yoomoney_status:False")
else:
status_kb = ikb(f"{assets_symbol} | Статус: Выключено ❌", data="payment_yoomoney_status:True")
keyboard.row(
ikb("Информация ♻️", data="payment_yoomoney_check"),
).row(
ikb("Баланс 💰", data="payment_yoomoney_balance"),
).row(
ikb("Изменить 🖍", data="payment_yoomoney_edit"),
).row(
ikb("⁠", data="..."),
).row(
status_kb,
)
return keyboard.as_markup()
# Управление - Звёзды
async def payment_stars_finl() -> InlineKeyboardMarkup:
keyboard = InlineKeyboardBuilder()
@@ -132,9 +107,13 @@ async def payment_stars_finl() -> InlineKeyboardMarkup:
assets_symbol = "➕"
if get_payments.status_stars == "True":
status_kb = ikb(f"{assets_symbol} | Статус: Включено ✅", data="payment_stars_status:False")
status_kb = ikb(
f"{assets_symbol} | Статус: Включено ✅", data="payment_stars_status:False"
)
else:
status_kb = ikb(f"{assets_symbol} | Статус: Выключено ❌", data="payment_stars_status:True")
status_kb = ikb(
f"{assets_symbol} | Статус: Выключено ❌", data="payment_stars_status:True"
)
keyboard.row(
ikb("Информация ♻️", data="payment_stars_check"),
@@ -169,16 +148,9 @@ async def settings_finl() -> InlineKeyboardMarkup:
if get_settings.misc_support == "None":
support_kb = ikb("Не установлена ❌", data="settings_edit_support")
else:
support_kb = ikb(f"@{get_settings.misc_support} ✅", data="settings_edit_support")
# Вебхук дискорда
if get_settings.misc_discord_webhook_url == "None":
discord_webhook_kb = ikb("Отсутствует ❌", data="settings_edit_discord_webhook")
else:
discord_webhook_kb = ikb(f"{get_settings.misc_discord_webhook_name} ✅", data="settings_edit_discord_webhook")
# Текстовый хостинг по умолчанию
hosting_text_default_kb = ikb(get_settings.misc_hosting_text.title(), data="settings_edit_hosting_text")
support_kb = ikb(
f"@{get_settings.misc_support} ✅", data="settings_edit_support"
)
# Скрытие категорий без товаров
if get_settings.misc_hide_category == "True":
@@ -199,19 +171,20 @@ async def settings_finl() -> InlineKeyboardMarkup:
method_prod_kb = ikb("На каждой строке", data="settings_edit_method_prod:skip")
keyboard.row(
ikb("❔ FAQ", data="..."), faq_kb,
ikb("❔ FAQ", data="..."),
faq_kb,
).row(
ikb("☎️ Поддержка", data="..."), support_kb,
ikb("☎️ Поддержка", data="..."),
support_kb,
).row(
ikb("🧿 Дискорд Webhook", url="https://teletype.in/@djimbox/djimboshop-discord"), discord_webhook_kb,
ikb("🎁 Категории без товаров", data="..."),
hide_category_kb,
).row(
ikb("🗯 Текстовый хостинг", data="..."), hosting_text_default_kb,
ikb("🎁 Позиции без товаров", data="..."),
hide_position_kb,
).row(
ikb("🎁 Категории без товаров", data="..."), hide_category_kb,
).row(
ikb("🎁 Позиции без товаров", data="..."), hide_position_kb,
).row(
ikb("🎁 Метод добавления", data="..."), method_prod_kb,
ikb("🎁 Метод добавления", data="..."),
method_prod_kb,
)
return keyboard.as_markup()
@@ -227,7 +200,9 @@ async def settings_status_finl() -> InlineKeyboardMarkup:
status_buy_kb = ikb("Включены ✅", data="settings_status_buy:False")
status_refill_kb = ikb("Включены ✅", data="settings_status_refill:False")
notification_buy_kb = ikb("Включены 🔔", data="settings_notification_buy:False")
notification_refill_kb = ikb("Включены 🔔", data="settings_notification_refill:False")
notification_refill_kb = ikb(
"Включены 🔔", data="settings_notification_refill:False"
)
if get_settings.status_buy == "False":
status_buy_kb = ikb("Выключены ❌", data="settings_status_buy:True")
@@ -238,18 +213,25 @@ async def settings_status_finl() -> InlineKeyboardMarkup:
if get_settings.notification_buy == "False":
notification_buy_kb = ikb("Выключены 🔕", data="settings_notification_buy:True")
if get_settings.notification_refill == "False":
notification_refill_kb = ikb("Выключены 🔕", data="settings_notification_refill:True")
notification_refill_kb = ikb(
"Выключены 🔕", data="settings_notification_refill:True"
)
keyboard.row(
ikb("⛔ Тех. работы", data="..."), status_work_kb,
ikb("⛔ Тех. работы", data="..."),
status_work_kb,
).row(
ikb("💰 Пополнения", data="..."), status_refill_kb,
ikb("💰 Пополнения", data="..."),
status_refill_kb,
).row(
ikb("🎁 Покупки", data="..."), status_buy_kb,
ikb("🎁 Покупки", data="..."),
status_buy_kb,
).row(
ikb("📢 Увед. о покупках", data="..."), notification_buy_kb,
ikb("📢 Увед. о покупках", data="..."),
notification_buy_kb,
).row(
ikb("📢 Увед. о пополнениях", data="..."), notification_refill_kb,
ikb("📢 Увед. о пополнениях", data="..."),
notification_refill_kb,
)
return keyboard.as_markup()
tgbot/keyboards/inline_admin_products.py
+36 -15
View File
@@ -10,7 +10,9 @@ from tgbot.utils.const_functions import ikb
################################################################################
################################### КАТЕГОРИИ ##################################
# Изменение категории
async def category_edit_open_finl(bot: Bot, category_id: int, remover: int) -> InlineKeyboardMarkup:
async def category_edit_open_finl(
bot: Bot, category_id: int, remover: int
) -> InlineKeyboardMarkup:
keyboard = InlineKeyboardBuilder()
get_bot = await bot.get_me()
@@ -19,7 +21,10 @@ async def category_edit_open_finl(bot: Bot, category_id: int, remover: int) -> I
ikb("▪️ Изм. Название", data=f"category_edit_name:{category_id}:{remover}"),
ikb("▪️ Добавить позицию", data=f"position_add_open:{category_id}"),
).row(
ikb("▪️ Скопировать ссылку", copy=f"t.me/{get_bot.username}?start=c_{category_id}"),
ikb(
"▪️ Скопировать ссылку",
copy=f"t.me/{get_bot.username}?start=c_{category_id}",
),
ikb("▪️ Удалить", data=f"category_edit_delete:{category_id}:{remover}"),
).row(
ikb("🔙 Вернуться", data=f"category_edit_swipe:{remover}"),
@@ -34,8 +39,11 @@ def category_edit_delete_finl(category_id: int, remover: int) -> InlineKeyboardM
keyboard = InlineKeyboardBuilder()
keyboard.row(
ikb("✅ Да, удалить", data=f"category_edit_delete_confirm:{category_id}:{remover}"),
ikb("❌ Нет, отменить", data=f"category_edit_open:{category_id}:{remover}")
ikb(
"✅ Да, удалить",
data=f"category_edit_delete_confirm:{category_id}:{remover}",
),
ikb("❌ Нет, отменить", data=f"category_edit_open:{category_id}:{remover}"),
)
return keyboard.as_markup()
@@ -55,7 +63,9 @@ def category_edit_cancel_finl(category_id: int, remover: int) -> InlineKeyboardM
################################################################################
#################################### ПОЗИЦИИ ###################################
# Кнопки при открытии позиции для изменения
async def position_edit_open_finl(bot: Bot, position_id: int, remover: int) -> InlineKeyboardMarkup:
async def position_edit_open_finl(
bot: Bot, position_id: int, remover: int
) -> InlineKeyboardMarkup:
keyboard = InlineKeyboardBuilder()
get_position = await Positionx().get_required(position_id=position_id)
@@ -66,7 +76,6 @@ async def position_edit_open_finl(bot: Bot, position_id: int, remover: int) -> I
ikb("▪️ Изм. Цену", data=f"position_edit_price:{position_id}:{remover}"),
).row(
ikb("▪️ Изм. Описание", data=f"position_edit_desc:{position_id}:{remover}"),
ikb("▪️ Изм. Фото", data=f"position_edit_photo:{position_id}:{remover}"),
).row(
ikb("▪️ Добавить Товары", data=f"item_add_position_open:{position_id}"),
ikb("▪️ Выгрузить Товары", data=f"position_edit_items:{position_id}:{remover}"),
@@ -74,10 +83,16 @@ async def position_edit_open_finl(bot: Bot, position_id: int, remover: int) -> I
ikb("▪️ Очистить Товары", data=f"position_edit_clear:{position_id}:{remover}"),
ikb("▪️ Удалить Товар", data=f"item_delete_swipe:{position_id}:0"),
).row(
ikb("▪️ Скопировать ссылку", copy=f"t.me/{get_bot.username}?start=p_{position_id}"),
ikb(
"▪️ Скопировать ссылку",
copy=f"t.me/{get_bot.username}?start=p_{position_id}",
),
ikb("▪️ Удалить Позицию", data=f"position_edit_delete:{position_id}:{remover}"),
).row(
ikb("🔙 Вернуться", data=f"position_edit_swipe:{get_position.category_id}:{remover}"),
ikb(
"🔙 Вернуться",
data=f"position_edit_swipe:{get_position.category_id}:{remover}",
),
ikb("▪️ Обновить", data=f"position_edit_open:{position_id}:{remover}"),
)
@@ -89,8 +104,11 @@ def position_edit_delete_finl(position_id: int, remover: int) -> InlineKeyboardM
keyboard = InlineKeyboardBuilder()
keyboard.row(
ikb("✅ Да, удалить", data=f"position_edit_delete_confirm:{position_id}:{remover}"),
ikb("❌ Нет, отменить", data=f"position_edit_open:{position_id}:{remover}")
ikb(
"✅ Да, удалить",
data=f"position_edit_delete_confirm:{position_id}:{remover}",
),
ikb("❌ Нет, отменить", data=f"position_edit_open:{position_id}:{remover}"),
)
return keyboard.as_markup()
@@ -101,8 +119,11 @@ def position_edit_clear_finl(position_id: int, remover: int) -> InlineKeyboardMa
keyboard = InlineKeyboardBuilder()
keyboard.row(
ikb("✅ Да, очистить", data=f"position_edit_clear_confirm:{position_id}:{remover}"),
ikb("❌ Нет, отменить", data=f"position_edit_open:{position_id}:{remover}")
ikb(
"✅ Да, очистить",
data=f"position_edit_clear_confirm:{position_id}:{remover}",
),
ikb("❌ Нет, отменить", data=f"position_edit_open:{position_id}:{remover}"),
)
return keyboard.as_markup()
@@ -168,7 +189,7 @@ def products_removes_categories_finl() -> InlineKeyboardMarkup:
keyboard.row(
ikb("✅ Да, удалить все", data="prod_removes_categories_confirm"),
ikb("❌ Нет, отменить", data="prod_removes_return")
ikb("❌ Нет, отменить", data="prod_removes_return"),
)
return keyboard.as_markup()
@@ -180,7 +201,7 @@ def products_removes_positions_finl() -> InlineKeyboardMarkup:
keyboard.row(
ikb("✅ Да, удалить все", data="prod_removes_positions_confirm"),
ikb("❌ Нет, отменить", data="prod_removes_return")
ikb("❌ Нет, отменить", data="prod_removes_return"),
)
return keyboard.as_markup()
@@ -192,7 +213,7 @@ def products_removes_items_finl() -> InlineKeyboardMarkup:
keyboard.row(
ikb("✅ Да, удалить все", data="prod_removes_items_confirm"),
ikb("❌ Нет, отменить", data="prod_removes_return")
ikb("❌ Нет, отменить", data="prod_removes_return"),
)
return keyboard.as_markup()
tgbot/keyboards/inline_user.py
+3 -5
View File
@@ -43,8 +43,6 @@ async def refill_method_finl() -> InlineKeyboardMarkup:
if get_payments.status_cryptobot == "True":
keyboard.row(ikb("🔷 CryptoBot", data="user_refill_method:Cryptobot"))
if get_payments.status_yoomoney == "True":
keyboard.row(ikb("🔮 ЮMoney", data="user_refill_method:Yoomoney"))
if get_payments.status_stars == "True":
keyboard.row(ikb("⭐️ Звёзды", data="user_refill_method:Stars"))
@@ -54,7 +52,9 @@ async def refill_method_finl() -> InlineKeyboardMarkup:
# Проверка платежа
def refill_bill_finl(pay_link: str, pay_receipt: Union[str, int], pay_method: str) -> InlineKeyboardMarkup:
def refill_bill_finl(
pay_link: str, pay_receipt: Union[str, int], pay_method: str
) -> InlineKeyboardMarkup:
keyboard = InlineKeyboardBuilder()
keyboard.row(
@@ -74,8 +74,6 @@ async def refill_method_buy_finl() -> InlineKeyboardMarkup:
if get_payments.status_cryptobot == "True":
keyboard.row(ikb("🔷 CryptoBot", data="user_refill_method:Cryptobot"))
if get_payments.status_yoomoney == "True":
keyboard.row(ikb("🔮 ЮMoney", data="user_refill_method:Yoomoney"))
if get_payments.status_stars == "True":
keyboard.row(ikb("⭐️ Звёзды", data="user_refill_method:Stars"))
tgbot/keyboards/reply_main.py
+23 -10
View File
@@ -11,16 +11,22 @@ def menu_frep(user_id: int) -> ReplyKeyboardMarkup:
keyboard = ReplyKeyboardBuilder()
keyboard.row(
rkb("🎁 Купить"), rkb("👤 Профиль"), rkb("🧮 Наличие товаров"),
rkb("🎁 Купить"),
rkb("👤 Профиль"),
rkb("🧮 Наличие товаров"),
).row(
rkb("☎️ Поддержка"), rkb("❔ FAQ"),
rkb("☎️ Поддержка"),
rkb("❔ FAQ"),
)
if user_id in get_admins():
keyboard.row(
rkb("🎁 Управление товарами"), rkb("📊 Статистика"),
rkb("🎁 Управление товарами"),
rkb("📊 Статистика"),
).row(
rkb("⚙️ Настройки"), rkb("🔆 Общие функции"), rkb("🔑 Платежные системы"),
rkb("⚙️ Настройки"),
rkb("🔆 Общие функции"),
rkb("🔑 Платежные системы"),
)
return keyboard.as_markup(resize_keyboard=True)
@@ -31,7 +37,8 @@ def payments_frep() -> ReplyKeyboardMarkup:
keyboard = ReplyKeyboardBuilder()
keyboard.row(
rkb("🔷 CryptoBot"), rkb("🔮 ЮMoney"), rkb("⭐️ Звёзды"),
rkb("🔷 CryptoBot"),
rkb("⭐️ Звёзды"),
).row(
rkb("🔙 Главное меню"),
)
@@ -44,7 +51,8 @@ def functions_frep() -> ReplyKeyboardMarkup:
keyboard = ReplyKeyboardBuilder()
keyboard.row(
rkb("🔍 Поиск"), rkb("📢 Рассылка"),
rkb("🔍 Поиск"),
rkb("📢 Рассылка"),
).row(
rkb("🔙 Главное меню"),
)
@@ -57,7 +65,8 @@ def settings_frep() -> ReplyKeyboardMarkup:
keyboard = ReplyKeyboardBuilder()
keyboard.row(
rkb("🖍 Изменить данные"), rkb("🕹 Выключатели"),
rkb("🖍 Изменить данные"),
rkb("🕹 Выключатели"),
).row(
rkb("🔙 Главное меню"),
)
@@ -70,11 +79,15 @@ def items_frep() -> ReplyKeyboardMarkup:
keyboard = ReplyKeyboardBuilder()
keyboard.row(
rkb("📁 Создать позицию ➕"), rkb("🗃 Создать категорию ➕"),
rkb("📁 Создать позицию ➕"),
rkb("🗃 Создать категорию ➕"),
).row(
rkb("📁 Изменить позицию 🖍"), rkb("🗃 Изменить категорию 🖍"),
rkb("📁 Изменить позицию 🖍"),
rkb("🗃 Изменить категорию 🖍"),
).row(
rkb("🔙 Главное меню"), rkb("🎁 Добавить товары ➕"), rkb("❌ Удаление"),
rkb("🔙 Главное меню"),
rkb("🎁 Добавить товары ➕"),
rkb("❌ Удаление"),
)
return keyboard.as_markup(resize_keyboard=True)
tgbot/routers/admin/admin_payments.py
+50 -139
View File
@@ -4,12 +4,14 @@ from aiogram.filters import StateFilter
from aiogram.types import CallbackQuery, Message
from tgbot.database import Paymentsx
from tgbot.keyboards.inline_admin import payment_yoomoney_finl, close_finl, payment_cryptobot_finl, payment_stars_finl
from tgbot.keyboards.inline_admin import (
close_finl,
payment_cryptobot_finl,
payment_stars_finl,
)
from tgbot.services.api_cryptobot import CryptobotAPI
from tgbot.services.api_stars import StarsAPI
from tgbot.services.api_yoomoney import YoomoneyAPI
from tgbot.utils.const_functions import ded, is_number, to_number
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import FSM, ARS
router = Router(name=__name__)
@@ -17,7 +19,9 @@ router = Router(name=__name__)
# Управление - CryptoBot
@router.message(F.text == "🔷 CryptoBot")
async def payments_cryptobot_open(message: Message, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_open(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await message.answer(
@@ -26,17 +30,6 @@ async def payments_cryptobot_open(message: Message, bot: Bot, state: FSM, arSess
)
# Управление - ЮMoney
@router.message(F.text == "🔮 ЮMoney")
async def payments_yoomoney_open(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
await message.answer(
"<b>🔮 Управление - ЮMoney</b>",
reply_markup=await payment_yoomoney_finl(),
)
# Управление - Звёзды
@router.message(F.text == "⭐️ Звёзды")
async def payments_stars_open(message: Message, bot: Bot, state: FSM, arSession: ARS):
@@ -52,7 +45,9 @@ async def payments_stars_open(message: Message, bot: Bot, state: FSM, arSession:
################################### CRYPTOBOT ##################################
# Баланс - CryptoBot
@router.callback_query(F.data == "payment_cryptobot_balance")
async def payments_cryptobot_balance(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_balance(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
response = await (
await CryptobotAPI.connect(
bot=bot,
@@ -70,7 +65,9 @@ async def payments_cryptobot_balance(call: CallbackQuery, bot: Bot, state: FSM,
# Информация - CryptoBot
@router.callback_query(F.data == "payment_cryptobot_check")
async def payments_cryptobot_check(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_check(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
status, response = await (
await CryptobotAPI.connect(
bot=bot,
@@ -88,7 +85,9 @@ async def payments_cryptobot_check(call: CallbackQuery, bot: Bot, state: FSM, ar
# Изменение - CryptoBot
@router.callback_query(F.data == "payment_cryptobot_edit")
async def payments_cryptobot_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_edit(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.set_state("here_cryptobot_token")
await call.message.edit_text(
ded(f"""
@@ -102,13 +101,17 @@ async def payments_cryptobot_edit(call: CallbackQuery, bot: Bot, state: FSM, arS
# Выключатель - CryptoBot
@router.callback_query(F.data.startswith("payment_cryptobot_status:"))
async def payments_cryptobot_status(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_status(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_payments = await Paymentsx().get()
if get_status == "True" and get_payments.cryptobot_token == "None":
return await call.answer("❌ Токен данной платежной системы не был добавлен", True)
return await call.answer(
"❌ Токен данной платежной системы не был добавлен", True
)
await Paymentsx().update(status_cryptobot=get_status)
@@ -121,12 +124,16 @@ async def payments_cryptobot_status(call: CallbackQuery, bot: Bot, state: FSM, a
############################## ПРИНЯТИЕ CRYPTOBOT ##############################
# Принятие токена Cryptobot
@router.message(StateFilter("here_cryptobot_token"))
async def payments_cryptobot_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
async def payments_cryptobot_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
get_token = message.text
await state.clear()
cache_message = await message.answer("<b>🔷 Проверка введённых CryptoBot данных... 🔄</b>")
cache_message = await message.answer(
"<b>🔷 Проверка введённых CryptoBot данных... 🔄</b>"
)
status, response = await (
await CryptobotAPI.connect(
@@ -140,9 +147,13 @@ async def payments_cryptobot_get(message: Message, bot: Bot, state: FSM, arSessi
if status:
await Paymentsx().update(cryptobot_token=get_token)
await cache_message.edit_text("<b>🔷 CryptoBot кошелёк был успешно изменён ✅</b>")
await cache_message.edit_text(
"<b>🔷 CryptoBot кошелёк был успешно изменён ✅</b>"
)
else:
await cache_message.edit_text("<b>🔷 Не удалось изменить CryptoBot кошелёк ❌</b>")
await cache_message.edit_text(
"<b>🔷 Не удалось изменить CryptoBot кошелёк ❌</b>"
)
await message.answer(
"<b>🔷 Управление - CryptoBot</b>",
@@ -150,121 +161,13 @@ async def payments_cryptobot_get(message: Message, bot: Bot, state: FSM, arSessi
)
################################################################################
#################################### ЮMoney ####################################
# Баланс - ЮMoney
@router.callback_query(F.data == "payment_yoomoney_balance")
async def payments_yoomoney_balance(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
response = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
update=call,
skipping_error=True,
)
).balance()
await call.message.answer(
response,
reply_markup=close_finl(),
)
# Информация - ЮMoney
@router.callback_query(F.data == "payment_yoomoney_check")
async def payments_yoomoney_check(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
response = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
update=call,
skipping_error=True,
)
).check()
await call.message.answer(
response,
reply_markup=close_finl(),
)
# Изменение - ЮMoney
@router.callback_query(F.data == "payment_yoomoney_edit")
async def payments_yoomoney_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
response = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
)
).authorization_get()
await state.set_state("here_yoomoney_token")
await call.message.edit_text(
ded(f"""
<b>🔮 Изменение ЮMoney кошелька - <a href='https://teletype.in/@djimbox/djimboshop-yoomoney'>Инструкция</a></b>
➖➖➖➖➖➖➖➖➖➖
▪️ Отправьте ссылку/код из адресной строки
▪️ {response}
"""),
disable_web_page_preview=True,
)
# Выключатель - ЮMoney
@router.callback_query(F.data.startswith("payment_yoomoney_status:"))
async def payments_yoomoney_status(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
get_status = call.data.split(":")[1]
get_payments = await Paymentsx().get()
if get_status == "True" and get_payments.yoomoney_token == "None":
return await call.answer("❌ Токен данной платежной системы не был добавлен", True)
await Paymentsx().update(status_yoomoney=get_status)
await call.message.edit_text(
"<b>🔮 Управление - ЮMoney</b>",
reply_markup=await payment_yoomoney_finl(),
)
################################ ПРИНЯТИЕ ЮMONEY ###############################
# Принятие токена ЮMoney
@router.message(StateFilter("here_yoomoney_token"))
async def payments_yoomoney_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
get_code = message.text
try:
get_code = get_code[get_code.index("code=") + 5:].replace(" ", "")
except Exception:
bot_logger.debug("ЮMoney code= не найден в сообщении, пробую использовать текст как код", exc_info=True)
cache_message = await message.answer("<b>🔮 Проверка введённых ЮMoney данных... 🔄</b>")
status, token, response = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
)
).authorization_enter(str(get_code))
if status:
await Paymentsx().update(yoomoney_token=token)
await cache_message.edit_text(response)
await state.clear()
await message.answer(
"<b>🔮 Управление - ЮMoney</b>",
reply_markup=await payment_yoomoney_finl(),
)
################################################################################
#################################### ЗВЁЗДЫ ####################################
# Баланс - Звёзды
@router.callback_query(F.data == "payment_stars_balance")
async def payments_stars_balance(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_stars_balance(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
response = await (
await StarsAPI.connect(
bot=bot,
@@ -282,7 +185,9 @@ async def payments_stars_balance(call: CallbackQuery, bot: Bot, state: FSM, arSe
# Информация - Звёзды
@router.callback_query(F.data == "payment_stars_check")
async def payments_stars_check(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_stars_check(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
status, response = await (
await StarsAPI.connect(
bot=bot,
@@ -300,7 +205,9 @@ async def payments_stars_check(call: CallbackQuery, bot: Bot, state: FSM, arSess
# Изменение - Звёзды
@router.callback_query(F.data == "payment_stars_edit")
async def payments_stars_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_stars_edit(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_payments = await Paymentsx().get()
await state.set_state("here_stars_course")
@@ -317,7 +224,9 @@ async def payments_stars_edit(call: CallbackQuery, bot: Bot, state: FSM, arSessi
# Выключатель - Звёзды
@router.callback_query(F.data.startswith("payment_stars_status:"))
async def payments_stars_status(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def payments_stars_status(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
await Paymentsx().update(status_stars=get_status)
@@ -331,7 +240,9 @@ async def payments_stars_status(call: CallbackQuery, bot: Bot, state: FSM, arSes
############################# ПРИНЯТИЕ КУРСА ЗВЁЗД #############################
# Принятие курса Telegram Stars
@router.message(StateFilter("here_stars_course"))
async def payments_stars_course_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
async def payments_stars_course_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
if not is_number(message.text):
return await message.answer(
"<b>❌ Введите число. Например: <code>1.5</code></b>"
tgbot/routers/admin/admin_products.py
+176 -149
View File
@@ -26,12 +26,23 @@ from tgbot.keyboards.inline_admin_products import (
products_removes_items_finl,
item_add_finish_finl,
)
from tgbot.services.api_discord import DiscordAPI
from tgbot.services.api_hosting_text import HostingAPI
from tgbot.utils.const_functions import clear_list, is_number, to_number, del_message, ded, clear_html, gen_id
from tgbot.utils.const_functions import (
clear_list,
is_number,
to_number,
del_message,
ded,
clear_html,
gen_id,
)
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import FSM, ARS
from tgbot.utils.text_functions import category_open_admin, position_open_admin, item_open_admin
from tgbot.utils.text_functions import (
category_open_admin,
position_open_admin,
item_open_admin,
)
router = Router(name=__name__)
@@ -123,8 +134,10 @@ async def prod_removes(message: Message, bot: Bot, state: FSM, arSession: ARS):
################################################################################
############################### СОЗДАНИЕ КАТЕГОРИИ #############################
# Принятие названия категории для её создания
@router.message(F.text, StateFilter('here_category_name'))
async def prod_category_add_name_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
@router.message(F.text, StateFilter("here_category_name"))
async def prod_category_add_name_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
if len(message.text) > 50:
return await message.answer(
"<b>❌ Название не может превышать 50 символов</b>\n"
@@ -143,7 +156,9 @@ async def prod_category_add_name_get(message: Message, bot: Bot, state: FSM, arS
############################### ИЗМЕНЕНИЕ КАТЕГОРИИ ############################
# Страница выбора категорий для редактирования
@router.callback_query(F.data.startswith("category_edit_swipe:"))
async def prod_category_edit_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_category_edit_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
await call.message.edit_text(
@@ -154,7 +169,9 @@ async def prod_category_edit_swipe(call: CallbackQuery, bot: Bot, state: FSM, ar
# Выбор текущей категории для редактирования
@router.callback_query(F.data.startswith("category_edit_open:"))
async def prod_category_edit_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_category_edit_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -167,7 +184,9 @@ async def prod_category_edit_open(call: CallbackQuery, bot: Bot, state: FSM, arS
############################ САМО ИЗМЕНЕНИЕ КАТЕГОРИИ ##########################
# Изменение названия категории
@router.callback_query(F.data.startswith("category_edit_name:"))
async def prod_category_edit_name(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_category_edit_name(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -184,10 +203,12 @@ async def prod_category_edit_name(call: CallbackQuery, bot: Bot, state: FSM, arS
# Принятие нового названия для категории
@router.message(F.text, StateFilter('here_category_edit_name'))
async def prod_category_edit_name_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
category_id = (await state.get_data())['here_category_id']
remover = (await state.get_data())['here_remover']
@router.message(F.text, StateFilter("here_category_edit_name"))
async def prod_category_edit_name_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
category_id = (await state.get_data())["here_category_id"]
remover = (await state.get_data())["here_remover"]
if len(message.text) > 50:
return await message.answer(
@@ -204,7 +225,9 @@ async def prod_category_edit_name_get(message: Message, bot: Bot, state: FSM, ar
# Удаление категории
@router.callback_query(F.data.startswith("category_edit_delete:"))
async def prod_category_edit_delete(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_category_edit_delete(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -216,7 +239,9 @@ async def prod_category_edit_delete(call: CallbackQuery, bot: Bot, state: FSM, a
# Подтверждение удаления категории
@router.callback_query(F.data.startswith("category_edit_delete_confirm:"))
async def prod_category_edit_delete_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_category_edit_delete_confirm(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -241,7 +266,9 @@ async def prod_category_edit_delete_confirm(call: CallbackQuery, bot: Bot, state
############################### ДОБАВЛЕНИЕ ПОЗИЦИИ #############################
# Cтраницы выбора категорий для расположения позиции
@router.callback_query(F.data.startswith("position_add_swipe:"))
async def prod_position_add_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_add_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
await call.message.edit_text(
@@ -252,7 +279,9 @@ async def prod_position_add_swipe(call: CallbackQuery, bot: Bot, state: FSM, arS
# Выбор категории для создания позиции
@router.callback_query(F.data.startswith("position_add_open:"))
async def prod_position_add_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_add_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
await state.update_data(here_category_id=category_id)
@@ -262,8 +291,10 @@ async def prod_position_add_open(call: CallbackQuery, bot: Bot, state: FSM, arSe
# Принятие названия для создания позиции
@router.message(F.text, StateFilter('here_position_name'))
async def prod_position_add_name_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
@router.message(F.text, StateFilter("here_position_name"))
async def prod_position_add_name_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
if len(message.text) > 50:
return await message.answer(
"<b>❌ Название не может превышать 50 символов</b>\n"
@@ -277,12 +308,13 @@ async def prod_position_add_name_get(message: Message, bot: Bot, state: FSM, arS
# Принятие цены позиции для её создания
@router.message(F.text, StateFilter('here_position_price'))
async def prod_position_add_price_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
@router.message(F.text, StateFilter("here_position_price"))
async def prod_position_add_price_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
if not is_number(message.text):
return await message.answer(
"<b>❌ Данные были введены неверно</b>\n"
"📁 Введите цену для позиции",
"<b>❌ Данные были введены неверно</b>\n" "📁 Введите цену для позиции",
)
if to_number(message.text) > 10_000_000 or to_number(message.text) < 0:
@@ -291,11 +323,10 @@ async def prod_position_add_price_get(message: Message, bot: Bot, state: FSM, ar
"📁 Введите цену для позиции",
)
category_id = (await state.get_data())['here_category_id']
position_name = (await state.get_data())['here_position_name']
category_id = (await state.get_data())["here_category_id"]
position_name = (await state.get_data())["here_position_name"]
position_price = to_number(message.text)
position_desc = "None"
position_photo = "None"
position_id = gen_id(12)
await state.clear()
@@ -305,7 +336,6 @@ async def prod_position_add_price_get(message: Message, bot: Bot, state: FSM, ar
position_name=position_name,
position_price=position_price,
position_desc=position_desc,
position_photo=position_photo,
)
await position_open_admin(bot, position_id, message.from_user.id)
@@ -315,7 +345,9 @@ async def prod_position_add_price_get(message: Message, bot: Bot, state: FSM, ar
############################ РЕДАКТИРОВАНИЕ ПОЗИЦИИ ############################
# Страницы выбора категории для редактирования позиции
@router.callback_query(F.data.startswith("position_edit_category_swipe:"))
async def prod_position_edit_category_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_category_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
await call.message.edit_text(
@@ -326,7 +358,9 @@ async def prod_position_edit_category_swipe(call: CallbackQuery, bot: Bot, state
# Открытие категории для выбора позиции
@router.callback_query(F.data.startswith("position_edit_category_open:"))
async def prod_position_edit_category_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_category_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
get_category = await Categoryx().get_required(category_id=category_id)
@@ -338,12 +372,16 @@ async def prod_position_edit_category_open(call: CallbackQuery, bot: Bot, state:
reply_markup=await position_edit_swipe_fp(0, category_id),
)
else:
await call.answer(f"📁 Позиции в категории {get_category.category_name} отсутствуют")
await call.answer(
f"📁 Позиции в категории {get_category.category_name} отсутствуют"
)
# Страницы выбора позиции для редактирования
@router.callback_query(F.data.startswith("position_edit_swipe:"))
async def prod_position_edit_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -357,7 +395,9 @@ async def prod_position_edit_swipe(call: CallbackQuery, bot: Bot, state: FSM, ar
# Выбор позиции для редактирования
@router.callback_query(F.data.startswith("position_edit_open:"))
async def prod_position_edit_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -370,7 +410,9 @@ async def prod_position_edit_open(call: CallbackQuery, bot: Bot, state: FSM, arS
############################ САМО ИЗМЕНЕНИЕ ПОЗИЦИИ ############################
# Изменение названия позиции
@router.callback_query(F.data.startswith("position_edit_name:"))
async def prod_position_edit_name(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_name(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -386,10 +428,12 @@ async def prod_position_edit_name(call: CallbackQuery, bot: Bot, state: FSM, arS
# Принятие названия позиции для её изменения
@router.message(F.text, StateFilter('here_position_edit_name'))
async def prod_position_edit_name_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
position_id = (await state.get_data())['here_position_id']
remover = (await state.get_data())['here_remover']
@router.message(F.text, StateFilter("here_position_edit_name"))
async def prod_position_edit_name_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
position_id = (await state.get_data())["here_position_id"]
remover = (await state.get_data())["here_remover"]
if len(message.text) > 50:
return await message.answer(
@@ -406,7 +450,9 @@ async def prod_position_edit_name_get(message: Message, bot: Bot, state: FSM, ar
# Изменение цены позиции
@router.callback_query(F.data.startswith("position_edit_price:"))
async def prod_position_edit_price(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_price(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -422,10 +468,12 @@ async def prod_position_edit_price(call: CallbackQuery, bot: Bot, state: FSM, ar
# Принятие цены позиции для её изменения
@router.message(F.text, StateFilter('here_position_edit_price'))
async def prod_position_edit_price_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
position_id = (await state.get_data())['here_position_id']
remover = (await state.get_data())['here_remover']
@router.message(F.text, StateFilter("here_position_edit_price"))
async def prod_position_edit_price_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
position_id = (await state.get_data())["here_position_id"]
remover = (await state.get_data())["here_remover"]
if not is_number(message.text):
return await message.answer(
@@ -449,7 +497,9 @@ async def prod_position_edit_price_get(message: Message, bot: Bot, state: FSM, a
# Изменение описания позиции
@router.callback_query(F.data.startswith("position_edit_desc:"))
async def prod_position_edit_desc(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_desc(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -469,10 +519,12 @@ async def prod_position_edit_desc(call: CallbackQuery, bot: Bot, state: FSM, arS
# Принятие описания позиции для её изменения
@router.message(F.text, StateFilter('here_position_edit_desc'))
async def prod_position_edit_desc_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
position_id = (await state.get_data())['here_position_id']
remover = (await state.get_data())['here_remover']
@router.message(F.text, StateFilter("here_position_edit_desc"))
async def prod_position_edit_desc_get(
message: Message, bot: Bot, state: FSM, arSession: ARS
):
position_id = (await state.get_data())["here_position_id"]
remover = (await state.get_data())["here_remover"]
if len(message.text) > 1200:
return await message.answer(
@@ -510,74 +562,11 @@ async def prod_position_edit_desc_get(message: Message, bot: Bot, state: FSM, ar
await position_open_admin(bot, position_id, message.from_user.id)
# Изменение изображения позиции
@router.callback_query(F.data.startswith("position_edit_photo:"))
async def prod_position_edit_photo(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
get_settings = await Settingsx().get()
if get_settings.misc_discord_webhook_url == "None":
return await call.answer("🧿 Отсутствует Дискорд вебхук, добавьте его в настройках", True)
await state.update_data(here_position_id=position_id)
await state.update_data(here_remover=remover)
await state.set_state("here_position_edit_photo")
await del_message(call.message)
await call.message.answer(
"<b>📁 Отправьте новое изображение для позиции</b>\n"
"❕ Отправьте <code>0</code> чтобы пропустить.",
reply_markup=position_edit_cancel_finl(position_id, remover),
)
# Принятие нового фото для позиции
@router.message((F.text == "0") | F.photo, StateFilter('here_position_edit_photo'))
async def prod_position_edit_photo_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
position_id = (await state.get_data())['here_position_id']
remover = (await state.get_data())['here_remover']
get_settings = await Settingsx().get()
if get_settings.misc_discord_webhook_url == "None":
return await message.answer(
"<b>🧿 Отсутствует Дискорд вебхук, добавьте его в настройках</b>"
)
position_photo = "None"
if message.photo is not None:
cache_message = await message.answer(
"<b>♻️ Подождите, фотография загружается...</b>"
)
file_path = (await bot.get_file(message.photo[-1].file_id)).file_path
photo_path = await bot.download_file(file_path)
pay_image_status, pay_image_url = await (
await DiscordAPI.connect(
bot=bot,
arSession=arSession,
update=message,
)
).upload_photo(photo_path.read())
if pay_image_status:
position_photo = pay_image_url
await del_message(cache_message)
await state.clear()
await Positionx().update(position_id, position_photo=position_photo)
await position_open_admin(bot, position_id, message.from_user.id)
# Выгрузка товаров
@router.callback_query(F.data.startswith("position_edit_items:"))
async def prod_position_edit_items(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_items(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -607,7 +596,9 @@ async def prod_position_edit_items(call: CallbackQuery, bot: Bot, state: FSM, ar
# Удаление позиции
@router.callback_query(F.data.startswith("position_edit_delete:"))
async def prod_position_edit_delete(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_delete(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -621,7 +612,9 @@ async def prod_position_edit_delete(call: CallbackQuery, bot: Bot, state: FSM, a
# Подтверждение удаления позиции
@router.callback_query(F.data.startswith("position_edit_delete_confirm:"))
async def prod_position_edit_delete_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_delete_confirm(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -636,7 +629,9 @@ async def prod_position_edit_delete_confirm(call: CallbackQuery, bot: Bot, state
if len(get_positions) >= 1:
await call.message.edit_text(
"<b>📁 Выберите позицию для изменения 🖍</b>",
reply_markup=await position_edit_swipe_fp(remover, get_position.category_id),
reply_markup=await position_edit_swipe_fp(
remover, get_position.category_id
),
)
else:
await del_message(call.message)
@@ -644,7 +639,9 @@ async def prod_position_edit_delete_confirm(call: CallbackQuery, bot: Bot, state
# Очистка позиции
@router.callback_query(F.data.startswith("position_edit_clear:"))
async def prod_position_edit_clear(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_clear(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -657,7 +654,9 @@ async def prod_position_edit_clear(call: CallbackQuery, bot: Bot, state: FSM, ar
# Согласие на очистку позиции
@router.callback_query(F.data.startswith("position_edit_clear_confirm:"))
async def prod_position_edit_clear_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_edit_clear_confirm(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -672,7 +671,9 @@ async def prod_position_edit_clear_confirm(call: CallbackQuery, bot: Bot, state:
############################### ДОБАВЛЕНИЕ ТОВАРОВ #############################
# Страницы выбора категории для добавления товара
@router.callback_query(F.data.startswith("item_add_category_swipe:"))
async def prod_item_add_category_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_add_category_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
await call.message.edit_text(
@@ -683,7 +684,9 @@ async def prod_item_add_category_swipe(call: CallbackQuery, bot: Bot, state: FSM
# Открытие категории для выбора позиции
@router.callback_query(F.data.startswith("item_add_category_open:"))
async def prod_item_add_category_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_add_category_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -698,12 +701,16 @@ async def prod_item_add_category_open(call: CallbackQuery, bot: Bot, state: FSM,
reply_markup=await item_add_position_swipe_fp(0, category_id),
)
else:
await call.answer(f"🎁 Позиции в категории {get_category.category_name} отсутствуют")
await call.answer(
f"🎁 Позиции в категории {get_category.category_name} отсутствуют"
)
# Страницы выбора позиции для добавления товара
@router.callback_query(F.data.startswith("item_add_position_swipe:"))
async def prod_item_add_position_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_add_position_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -714,8 +721,10 @@ async def prod_item_add_position_swipe(call: CallbackQuery, bot: Bot, state: FSM
# Выбор позиции для добавления товаров
@router.callback_query(F.data.startswith("item_add_position_open:"), flags={'rate': 0})
async def prod_item_add_position_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
@router.callback_query(F.data.startswith("item_add_position_open:"), flags={"rate": 0})
async def prod_item_add_position_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
get_position = await Positionx().get_required(position_id=position_id)
@@ -734,9 +743,9 @@ async def prod_item_add_position_open(call: CallbackQuery, bot: Bot, state: FSM,
<b>🎁 Отправляйте данные товаров</b>
❗ Товары разделяются одной пустой строчкой. Пример:
<code>Данные товара...
Данные товара...
Данные товара...</code>
"""),
reply_markup=item_add_finish_finl(position_id),
@@ -755,12 +764,16 @@ async def prod_item_add_position_open(call: CallbackQuery, bot: Bot, state: FSM,
# Завершение загрузки товаров
@router.callback_query(F.data.startswith('item_add_position_finish:'), flags={'rate': 0})
async def prod_item_add_finish(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
@router.callback_query(
F.data.startswith("item_add_position_finish:"), flags={"rate": 0}
)
async def prod_item_add_finish(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
try:
count_items = (await state.get_data())['here_add_item_count']
count_items = (await state.get_data())["here_add_item_count"]
except Exception:
bot_logger.debug("В state нет счетчика добавленных товаров", exc_info=True)
count_items = 0
@@ -777,7 +790,7 @@ async def prod_item_add_finish(call: CallbackQuery, bot: Bot, state: FSM, arSess
# Принятие данных товара
@router.message(F.text, StateFilter('here_add_items'), flags={'rate': 0})
@router.message(F.text, StateFilter("here_add_items"), flags={"rate": 0})
async def prod_item_add_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
cache_message = await message.answer("<b>⌛ Ждите, товары добавляются..</b>")
@@ -788,9 +801,9 @@ async def prod_item_add_get(message: Message, bot: Bot, state: FSM, arSession: A
else:
get_items = clear_list(message.text.split("\n"))
item_count = (await state.get_data())['here_add_item_count']
category_id = (await state.get_data())['here_add_item_category_id']
position_id = (await state.get_data())['here_add_item_position_id']
item_count = (await state.get_data())["here_add_item_count"]
category_id = (await state.get_data())["here_add_item_category_id"]
position_id = (await state.get_data())["here_add_item_position_id"]
await state.update_data(here_add_item_count=item_count + len(get_items))
@@ -811,7 +824,9 @@ async def prod_item_add_get(message: Message, bot: Bot, state: FSM, arSession: A
############################### УДАЛЕНИЕ ТОВАРОВ ###############################
# Страницы удаления товаров
@router.callback_query(F.data.startswith("item_delete_swipe:"))
async def prod_item_delete_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_delete_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -826,12 +841,16 @@ async def prod_item_delete_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSe
reply_markup=await item_delete_swipe_fp(remover, position_id),
)
else:
await call.answer(f"🎁 Товары в позиции {get_position.position_name} отсутствуют", True)
await call.answer(
f"🎁 Товары в позиции {get_position.position_name} отсутствуют", True
)
# Удаление товара
@router.callback_query(F.data.startswith("item_delete_open:"))
async def prod_item_delete_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_delete_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
item_id = int(call.data.split(":")[1])
await del_message(call.message)
@@ -840,7 +859,9 @@ async def prod_item_delete_open(call: CallbackQuery, bot: Bot, state: FSM, arSes
# Подтверждение удаления товара
@router.callback_query(F.data.startswith("item_delete_confirm:"))
async def prod_item_delete_confirm_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_item_delete_confirm_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
item_id = int(call.data.split(":")[1])
get_item = await Itemx().get_required(item_id=item_id)
@@ -862,7 +883,9 @@ async def prod_item_delete_confirm_open(call: CallbackQuery, bot: Bot, state: FS
############################### УДАЛЕНИЕ РАЗДЕЛОВ ##############################
# Возвращение к меню удаления разделов
@router.callback_query(F.data == "prod_removes_return")
async def prod_removes_return(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_removes_return(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await call.message.edit_text(
@@ -873,7 +896,9 @@ async def prod_removes_return(call: CallbackQuery, bot: Bot, state: FSM, arSessi
# Удаление всех категорий
@router.callback_query(F.data == "prod_removes_categories")
async def prod_removes_categories(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_removes_categories(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_categories = len(await Categoryx().get_all())
get_positions = len(await Positionx().get_all())
get_items = len(await Itemx().get_all())
@@ -891,7 +916,9 @@ async def prod_removes_categories(call: CallbackQuery, bot: Bot, state: FSM, arS
# Подтверждение удаления всех категорий (позиций и товаров включительно)
@router.callback_query(F.data == "prod_removes_categories_confirm")
async def prod_removes_categories_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_removes_categories_confirm(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_categories = len(await Categoryx().get_all())
get_positions = len(await Positionx().get_all())
get_items = len(await Itemx().get_all())
@@ -900,19 +927,19 @@ async def prod_removes_categories_confirm(call: CallbackQuery, bot: Bot, state:
await Positionx().clear()
await Itemx().clear()
await call.message.edit_text(
ded(f"""
await call.message.edit_text(ded(f"""
<b>✅ Вы успешно удалили все категории</b>
🗃 Категорий: <code>{get_categories}шт</code>
📁 Позиций: <code>{get_positions}шт</code>
🎁 Товаров: <code>{get_items}шт</code>
""")
)
"""))
# Удаление всех позиций
@router.callback_query(F.data == "prod_removes_positions")
async def prod_removes_positions(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_removes_positions(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_positions = len(await Positionx().get_all())
get_items = len(await Itemx().get_all())
@@ -928,20 +955,20 @@ async def prod_removes_positions(call: CallbackQuery, bot: Bot, state: FSM, arSe
# Подтверждение удаления всех позиций (товаров включительно)
@router.callback_query(F.data == "prod_removes_positions_confirm")
async def prod_position_remove(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def prod_position_remove(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_positions = len(await Positionx().get_all())
get_items = len(await Itemx().get_all())
await Positionx().clear()
await Itemx().clear()
await call.message.edit_text(
ded(f"""
await call.message.edit_text(ded(f"""
<b>✅ Вы успешно удалили все позиции</b>
📁 Позиций: <code>{get_positions}шт</code>
🎁 Товаров: <code>{get_items}шт</code>
""")
)
"""))
# Удаление всех товаров
tgbot/routers/admin/admin_settings.py
+30 -123
View File
@@ -5,7 +5,6 @@ from aiogram.types import CallbackQuery, Message
from tgbot.database import Settingsx, Userx
from tgbot.keyboards.inline_admin import settings_status_finl, settings_finl
from tgbot.services.api_discord import DiscordDJ, DiscordAPI
from tgbot.utils.const_functions import ded
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import FSM, ARS
@@ -40,7 +39,9 @@ async def settings_status_edit(message: Message, bot: Bot, state: FSM, arSession
################################## ВЫКЛЮЧАТЕЛИ #################################
# Включение/выключение тех работ
@router.callback_query(F.data.startswith("settings_status_work:"))
async def settings_status_work(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_status_work(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_user = await Userx().get_required(user_id=call.from_user.id)
@@ -65,7 +66,9 @@ async def settings_status_work(call: CallbackQuery, bot: Bot, state: FSM, arSess
# Включение/выключение покупок
@router.callback_query(F.data.startswith("settings_status_buy:"))
async def settings_status_buy(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_status_buy(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_user = await Userx().get_required(user_id=call.from_user.id)
@@ -90,7 +93,9 @@ async def settings_status_buy(call: CallbackQuery, bot: Bot, state: FSM, arSessi
# Включение/выключение пополнений
@router.callback_query(F.data.startswith("settings_status_refill:"))
async def settings_status_refill(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_status_refill(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_user = await Userx().get_required(user_id=call.from_user.id)
@@ -113,7 +118,9 @@ async def settings_status_refill(call: CallbackQuery, bot: Bot, state: FSM, arSe
# Включение/выключение уведомлений о покупках
@router.callback_query(F.data.startswith("settings_notification_buy:"))
async def settings_notification_buy(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_notification_buy(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_user = await Userx().get_required(user_id=call.from_user.id)
@@ -136,7 +143,9 @@ async def settings_notification_buy(call: CallbackQuery, bot: Bot, state: FSM, a
# Включение/выключение уведомлений о пополнениях
@router.callback_query(F.data.startswith("settings_notification_refill:"))
async def settings_notification_refill(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_notification_refill(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
get_status = call.data.split(":")[1]
get_user = await Userx().get_required(user_id=call.from_user.id)
@@ -165,20 +174,20 @@ async def settings_faq_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession
await state.clear()
await state.set_state("here_settings_faq")
await call.message.edit_text(
ded("""
await call.message.edit_text(ded("""
<b>❔ Введите новый текст для FAQ</b>
❕ Вы можете использовать заготовленный синтаксис и HTML разметку:
▪️ <code>{username}</code> - логин пользоваля
▪️ <code>{user_id}</code> - айди пользователя
▪️ <code>{firstname}</code> - имя пользователя
""")
)
"""))
# Изменение поддержки
@router.callback_query(F.data == "settings_edit_support")
async def settings_support_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_support_edit(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await state.set_state("here_settings_support")
@@ -190,7 +199,9 @@ async def settings_support_edit(call: CallbackQuery, bot: Bot, state: FSM, arSes
# Изменение отображения/скрытия категорий без товаров
@router.callback_query(F.data.startswith("settings_edit_hide_category:"))
async def settings_edit_hide_category(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_edit_hide_category(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
status = call.data.split(":")[1]
await Settingsx().update(misc_hide_category=status)
@@ -203,7 +214,9 @@ async def settings_edit_hide_category(call: CallbackQuery, bot: Bot, state: FSM,
# Изменение отображения/скрытия позиций без товаров
@router.callback_query(F.data.startswith("settings_edit_hide_position:"))
async def settings_edit_hide_position(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_edit_hide_position(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
status = call.data.split(":")[1]
await Settingsx().update(misc_hide_position=status)
@@ -216,7 +229,9 @@ async def settings_edit_hide_position(call: CallbackQuery, bot: Bot, state: FSM,
# Изменение метода добавления товаров
@router.callback_query(F.data.startswith("settings_edit_method_prod:"))
async def settings_edit_method_prod(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def settings_edit_method_prod(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
method = call.data.split(":")[1]
await Settingsx().update(misc_method_prod=method)
@@ -227,49 +242,6 @@ async def settings_edit_method_prod(call: CallbackQuery, bot: Bot, state: FSM, a
)
# Изменение дискорд вебхука
@router.callback_query(F.data == "settings_edit_discord_webhook")
async def settings_discord_edit(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
get_discord_public_webhook = await (
DiscordDJ(
arSession=arSession,
bot=bot,
)
).export_webhook()
await state.set_state("here_settings_discord_webhook")
await call.message.edit_text(
ded(f"""
<b>🧿 Отправьте новый вебхук дискорда</b>
❕ Для удаления вебхука введите <code>0</code>
❕ Вы можете использовать публичный вебхук, но ответственность за его использование лежит только на вас
▪️ Публичный вебхук: <code>{get_discord_public_webhook}</code>
""")
)
# Изменение текстового хостинга по умолчанию
@router.callback_query(F.data == "settings_edit_hosting_text")
async def settings_edit_hosting_text(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
get_settings = await Settingsx().get()
if get_settings.misc_hosting_text == "telegraph":
await Settingsx().update(misc_hosting_text="pastie")
elif get_settings.misc_hosting_text == "pastie":
await Settingsx().update(misc_hosting_text="friendpaste")
elif get_settings.misc_hosting_text == "friendpaste":
await Settingsx().update(misc_hosting_text="snippet")
elif get_settings.misc_hosting_text == "snippet":
await Settingsx().update(misc_hosting_text="telegraph")
await call.message.edit_text(
"<b>🖍 Изменение данных бота</b>",
reply_markup=await settings_finl(),
)
################################################################################
################################ ПРИНЯТИЕ ДАННЫХ ###############################
# Принятие FAQ
@@ -282,8 +254,7 @@ async def settings_faq_get(message: Message, bot: Bot, state: FSM, arSession: AR
except Exception:
bot_logger.debug("Некорректная HTML-разметка FAQ", exc_info=True)
return await message.answer(
"<b>❌ Ошибка синтаксиса HTML</b>\n"
"❔ Введите новый текст для FAQ",
"<b>❌ Ошибка синтаксиса HTML</b>\n" "❔ Введите новый текст для FAQ",
)
await state.clear()
@@ -310,67 +281,3 @@ async def settings_support_get(message: Message, bot: Bot, state: FSM, arSession
"<b>🖍 Изменение данных бота</b>",
reply_markup=await settings_finl(),
)
# Принятие дискорд вебхука
@router.message(F.text, StateFilter("here_settings_discord_webhook"))
async def settings_discord_get(message: Message, bot: Bot, state: FSM, arSession: ARS):
get_discord_webhook = message.text
# Удаление вебхука
if get_discord_webhook == "0":
await Settingsx().update(
misc_discord_webhook_url="None",
misc_discord_webhook_name="None",
)
return await message.answer(
"<b>⚙️ Настройки бота</b>",
reply_markup=await settings_finl(),
)
# Добавление нового вебхука
cache_message = await message.answer("<b>♻️ Проверка дискорд вебхука..</b>")
if "api" in get_discord_webhook and "webhooks" in get_discord_webhook:
discord_webhook_status, discord_webhook_name = await (
await DiscordAPI.connect(
bot=bot,
arSession=arSession,
update=message,
webhook_url=get_discord_webhook,
skipping_error=True,
)
).check()
if discord_webhook_status:
await state.clear()
await Settingsx().update(
misc_discord_webhook_url=message.text,
misc_discord_webhook_name=discord_webhook_name,
)
return await cache_message.edit_text(
"<b>⚙️ Настройки бота</b>",
reply_markup=await settings_finl(),
)
# Обработка ошибки добавления вебхука
get_discord_public_webhook = await (
DiscordDJ(
arSession=arSession,
bot=bot,
)
).export_webhook()
await cache_message.edit_text(
ded(f"""
<b>❌ Указан некорректный вебхук</b>
➖➖➖➖➖➖➖➖➖➖
🧿 Отправьте новый вебхук дискорда
❕ Для удаления вебхука введите <code>0</code>
❕ Вы можете использовать публичный вебхук, но ответственность за его использование лежит только на вас
▪️ Публичный вебхук: <code>{get_discord_public_webhook}</code>
""")
)
tgbot/routers/main_start.py
+23 -18
View File
@@ -14,21 +14,20 @@ from tgbot.utils.text_functions import position_open_user
# Игнор-колбэки покупок
prohibit_buy = (
'buy_category_swipe',
'buy_category_open',
'buy_position_swipe',
'buy_position_open',
'buy_item_open',
'buy_item_confirm',
"buy_category_swipe",
"buy_category_open",
"buy_position_swipe",
"buy_position_open",
"buy_item_open",
"buy_item_confirm",
)
# Игнор-колбэки пополнений
prohibit_refill = (
'user_refill',
'user_refill_method',
'Pay:Cryptobot',
'Pay:Yoomoney',
'Pay:',
"user_refill",
"user_refill_method",
"Pay:Cryptobot",
"Pay:",
)
router = Router(name=__name__)
@@ -54,7 +53,9 @@ async def filter_work_message(message: Message, bot: Bot, state: FSM, arSession:
# Фильтр на технические работы - колбэк
@router.callback_query(IsWork())
async def filter_work_callback(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def filter_work_callback(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await call.answer("⛔ Бот находится на технических работах.", True)
@@ -64,7 +65,7 @@ async def filter_work_callback(call: CallbackQuery, bot: Bot, state: FSM, arSess
################################# СТАТУС ПОКУПОК ###############################
# Фильтр на доступность покупок - сообщение
@router.message(IsBuy(), F.text == "🎁 Купить")
@router.message(IsBuy(), StateFilter('here_item_count'))
@router.message(IsBuy(), StateFilter("here_item_count"))
async def filter_buy_message(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -73,7 +74,9 @@ async def filter_buy_message(message: Message, bot: Bot, state: FSM, arSession:
# Фильтр на доступность покупок - колбэк
@router.callback_query(IsBuy(), F.data.startswith(prohibit_buy))
async def filter_buy_callback(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def filter_buy_callback(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await call.answer("⛔ Покупки временно отключены.", True)
@@ -82,7 +85,7 @@ async def filter_buy_callback(call: CallbackQuery, bot: Bot, state: FSM, arSessi
################################################################################
############################### СТАТУС ПОПОЛНЕНИЙ ##############################
# Фильтр на доступность пополнения - сообщение
@router.message(IsRefill(), StateFilter('here_refill_amount'))
@router.message(IsRefill(), StateFilter("here_refill_amount"))
async def filter_refill_message(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -91,7 +94,9 @@ async def filter_refill_message(message: Message, bot: Bot, state: FSM, arSessio
# Фильтр на доступность пополнения - колбэк
@router.callback_query(IsRefill(), F.data.startswith(prohibit_refill))
async def filter_refill_callback(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def filter_refill_callback(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await call.answer("⛔ Пополнение временно отключено.", True)
@@ -100,7 +105,7 @@ async def filter_refill_callback(call: CallbackQuery, bot: Bot, state: FSM, arSe
################################################################################
#################################### ПРОЧЕЕ ####################################
# Открытие главного меню
@router.message(F.text.in_(('🔙 Главное меню', '/start')))
@router.message(F.text.in_(("🔙 Главное меню", "/start")))
async def main_start(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -115,7 +120,7 @@ async def main_start(message: Message, bot: Bot, state: FSM, arSession: ARS):
# Открытие диплинков
@router.message(F.text.startswith('/start '))
@router.message(F.text.startswith("/start "))
async def main_start_deeplink(message: Message, bot: Bot, state: FSM, arSession: ARS):
deepling_args = message.text[7:]
tgbot/routers/user/user_menu.py
+13 -25
View File
@@ -5,7 +5,7 @@ from aiogram import Router, Bot, F
from aiogram.filters import Command
from aiogram.types import CallbackQuery, Message
from tgbot.data.config import BOT_VERSION, get_text_desc, get_text_warning
from tgbot.data.config import BOT_VERSION, get_text_desc
from tgbot.database import Purchasesx, Settingsx
from tgbot.keyboards.inline_user import user_support_finl
from tgbot.keyboards.inline_user_page import *
@@ -60,7 +60,7 @@ async def user_available(message: Message, bot: Bot, state: FSM, arSession: ARS)
# Открытие FAQ
@router.message(F.text.in_(('❔ FAQ', '/faq')))
@router.message(F.text.in_(("❔ FAQ", "/faq")))
async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -68,15 +68,7 @@ async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
if get_settings.misc_faq == "None":
return await message.answer(
ded(f"""
❔ Текст FAQ не указан. Измените его в настройках бота.
➖➖➖➖➖➖➖➖➖➖
{get_text_desc()}
➖➖➖➖➖➖➖➖➖➖
{get_text_warning()}
"""),
ded(f"""❔ Текст FAQ не указан."""),
disable_web_page_preview=True,
)
@@ -87,7 +79,7 @@ async def user_faq(message: Message, bot: Bot, state: FSM, arSession: ARS):
# Открытие сообщения с ссылкой на поддержку
@router.message(F.text.in_(('☎️ Поддержка', '/support')))
@router.message(F.text.in_(("☎️ Поддержка", "/support")))
async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -95,15 +87,7 @@ async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
if get_settings.misc_support == "None":
return await message.answer(
ded(f"""
☎️ Контакты поддержки не указаны. Измените их в настройках бота.
➖➖➖➖➖➖➖➖➖➖
{get_text_desc()}
➖➖➖➖➖➖➖➖➖➖
{get_text_warning()}
"""),
ded(f"""☎️ Контакты поддержки не указаны."""),
disable_web_page_preview=True,
)
@@ -114,7 +98,7 @@ async def user_support(message: Message, bot: Bot, state: FSM, arSession: ARS):
# Получение версии бота
@router.message(Command(commands=['version']))
@router.message(Command(commands=["version"]))
async def admin_version(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -122,7 +106,7 @@ async def admin_version(message: Message, bot: Bot, state: FSM, arSession: ARS):
# Получение информации о боте
@router.message(Command(commands=['dj_desc']))
@router.message(Command(commands=["dj_desc"]))
async def admin_desc(message: Message, bot: Bot, state: FSM, arSession: ARS):
await state.clear()
@@ -132,7 +116,9 @@ async def admin_desc(message: Message, bot: Bot, state: FSM, arSession: ARS):
################################################################################
# Переход к профилю
@router.callback_query(F.data == "user_profile")
async def user_profile_return(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_profile_return(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
await state.clear()
await del_message(call.message)
@@ -176,7 +162,9 @@ async def user_purchases(call: CallbackQuery, bot: Bot, state: FSM, arSession: A
# Страницы наличия товаров
@router.callback_query(F.data.startswith("user_available_swipe:"))
async def user_available_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_available_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
items_available, remover_max, remover_now = await get_items_available(remover)
tgbot/routers/user/user_products.py
+46 -15
View File
@@ -5,10 +5,21 @@ from aiogram import Router, Bot, F
from aiogram.filters import StateFilter
from aiogram.types import CallbackQuery, Message
from tgbot.database import Positionx, Userx, Categoryx, Itemx, Paymentsx, Purchasesx, Settingsx
from tgbot.database import (
Positionx,
Userx,
Categoryx,
Itemx,
Paymentsx,
Purchasesx,
Settingsx,
)
from tgbot.keyboards.inline_user import refill_method_buy_finl
from tgbot.keyboards.inline_user_page import *
from tgbot.keyboards.inline_user_products import products_buy_confirm_finl, products_return_finl
from tgbot.keyboards.inline_user_products import (
products_buy_confirm_finl,
products_return_finl,
)
from tgbot.keyboards.reply_main import menu_frep
from tgbot.utils.const_functions import ded, del_message, convert_date, send_admins
from tgbot.utils.misc.bot_models import FSM, ARS
@@ -20,7 +31,9 @@ router = Router(name=__name__)
# Страницы выбора категории для покупки товара
@router.callback_query(F.data.startswith("buy_category_swipe:"))
async def user_buy_category_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_buy_category_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
remover = int(call.data.split(":")[1])
await call.message.edit_text(
@@ -31,7 +44,9 @@ async def user_buy_category_swipe(call: CallbackQuery, bot: Bot, state: FSM, arS
# Открытие категории с выбором позиции для покупки товара
@router.callback_query(F.data.startswith("buy_category_open:"))
async def user_buy_category_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_buy_category_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -55,7 +70,9 @@ async def user_buy_category_open(call: CallbackQuery, bot: Bot, state: FSM, arSe
# Страницы выбора позиции для покупки товара
@router.callback_query(F.data.startswith("buy_position_swipe:"))
async def user_buy_position_swipe(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_buy_position_swipe(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
category_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -70,7 +87,9 @@ async def user_buy_position_swipe(call: CallbackQuery, bot: Bot, state: FSM, arS
# Открытие позиции для покупки товара
@router.callback_query(F.data.startswith("buy_position_open:"))
async def user_buy_position_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def user_buy_position_open(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
position_id = int(call.data.split(":")[1])
remover = int(call.data.split(":")[2])
@@ -94,7 +113,7 @@ async def user_buy_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: AR
# Проверка, имеется ли на балансе пользователя достаточно средств
if get_user.user_balance < get_position.position_price:
if get_payments.status_cryptobot == "True" or get_payments.status_yoomoney == "True":
if get_payments.status_cryptobot == "True":
await call.message.answer(
"<b>❗ На вашем счёте недостаточно средств</b>\n"
"💰 Выберите способ пополнения баланса",
@@ -103,7 +122,9 @@ async def user_buy_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: AR
return await call.answer(cache_time=5)
else:
return await call.answer("❗ У вас недостаточно средств. Пополните баланс", True)
return await call.answer(
"❗ У вас недостаточно средств. Пополните баланс", True
)
if len(get_items) < 1:
return await call.answer("❗ Товаров нет в наличии", True)
@@ -133,7 +154,9 @@ async def user_buy_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: AR
▪️ Количество: <code>1шт</code>
▪️ Сумма к покупке: <code>{get_position.position_price}₽</code>
"""),
reply_markup=products_buy_confirm_finl(position_id, get_position.category_id, 1),
reply_markup=products_buy_confirm_finl(
position_id, get_position.category_id, 1
),
)
else:
await state.update_data(here_buy_position_id=position_id)
@@ -155,7 +178,7 @@ async def user_buy_open(call: CallbackQuery, bot: Bot, state: FSM, arSession: AR
# Принятие количества товаров для покупки
@router.message(F.text, StateFilter("here_item_count"))
async def user_buy_count(message: Message, bot: Bot, state: FSM, arSession: ARS):
position_id = (await state.get_data())['here_buy_position_id']
position_id = (await state.get_data())["here_buy_position_id"]
get_position = await Positionx().get_required(position_id=position_id)
get_user = await Userx().get_required(user_id=message.from_user.id)
@@ -191,7 +214,9 @@ async def user_buy_count(message: Message, bot: Bot, state: FSM, arSession: ARS)
# Если товаров нет в наличии
if len(get_items) < 1:
await state.clear()
return await message.answer("<b>🎁 Товар который вы хотели купить, закончился</b>")
return await message.answer(
"<b>🎁 Товар который вы хотели купить, закончился</b>"
)
# Если введено кол-во товаров меньше 1 или меньше кол-ва имеющегося в наличии
if get_count < 1 or get_count > len(get_items):
@@ -217,7 +242,9 @@ async def user_buy_count(message: Message, bot: Bot, state: FSM, arSession: ARS)
▪️ Количество: <code>{get_count}шт</code>
▪️ Сумма к покупке: <code>{amount_pay}₽</code>
"""),
reply_markup=products_buy_confirm_finl(position_id, get_position.category_id, get_count),
reply_markup=products_buy_confirm_finl(
position_id, get_position.category_id, get_count
),
)
@@ -240,9 +267,13 @@ async def user_buy_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession:
elif purchase_result == "POSITION_NOT_FOUND":
return await call.message.edit_text("<b>❌ Позиция не была найдена</b>")
elif purchase_result == "NOT_ENOUGH_ITEMS":
return await call.message.edit_text("<b>❌ В наличии недостаточно товаров. Попробуйте другое кол-во</b>")
return await call.message.edit_text(
"<b>❌ В наличии недостаточно товаров. Попробуйте другое кол-во</b>"
)
elif purchase_result == "NOT_ENOUGH_BALANCE":
return await call.message.edit_text("<b>❌ На вашем балансе недостаточно средств</b>")
return await call.message.edit_text(
"<b>❌ На вашем балансе недостаточно средств</b>"
)
get_user = await Userx().get_required(user_id=call.from_user.id)
get_settings = await Settingsx().get()
@@ -272,5 +303,5 @@ async def user_buy_confirm(call: CallbackQuery, bot: Bot, state: FSM, arSession:
▪️ Пользователь: <b>@{get_user.user_login}</b> | <a href='tg://user?id={get_user.user_id}'>{get_user.user_name}</a> | <code>{get_user.user_id}</code>
▪️ Товар: <code>{purchase_result.position_name} | {purchase_result.purchase_count}шт | {purchase_result.purchase_price}₽</code>
▪️ Чек: <code>#{purchase_result.receipt}</code>
""")
"""),
)
tgbot/routers/user/user_transactions.py
+79 -95
View File
@@ -9,7 +9,6 @@ from tgbot.database import Paymentsx, Refillx, Userx, Settingsx
from tgbot.keyboards.inline_user import refill_bill_finl, refill_method_finl
from tgbot.services.api_cryptobot import CryptobotAPI
from tgbot.services.api_stars import StarsAPI
from tgbot.services.api_yoomoney import YoomoneyAPI
from tgbot.utils.const_functions import is_number, to_number, gen_id, ded
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import FSM, ARS
@@ -26,9 +25,8 @@ async def refill_method_list(call: CallbackQuery, bot: Bot, state: FSM, arSessio
get_payments = await Paymentsx().get()
if (
get_payments.status_cryptobot == "False" and
get_payments.status_yoomoney == "False" and
get_payments.status_stars == "False"
get_payments.status_cryptobot == "False"
and get_payments.status_stars == "False"
):
return await call.answer("❗️ Пополнения временно недоступны", True)
@@ -40,17 +38,21 @@ async def refill_method_list(call: CallbackQuery, bot: Bot, state: FSM, arSessio
# Выбор способа пополнения
@router.callback_query(F.data.startswith("user_refill_method:"))
async def refill_method_select(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
async def refill_method_select(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
refill_method = call.data.split(":")[1]
get_payments = await Paymentsx().get()
if refill_method == "Cryptobot" and get_payments.status_cryptobot == "False":
return await call.answer("❌ Пополнение данным способом временно недоступно", True)
elif refill_method == "Yoomoney" and get_payments.status_yoomoney == "False":
return await call.answer("❌ Пополнение данным способом временно недоступно", True)
return await call.answer(
"❌ Пополнение данным способом временно недоступно", True
)
elif refill_method == "Stars" and get_payments.status_stars == "False":
return await call.answer("❌ Пополнение данным способом временно недоступно", True)
return await call.answer(
"❌ Пополнение данным способом временно недоступно", True
)
await state.update_data(here_refill_method=refill_method)
@@ -83,7 +85,7 @@ async def refill_amount_get(message: Message, bot: Bot, state: FSM, arSession: A
cache_message = await message.answer("<b>♻️ Подождите, платёж генерируется..</b>")
refill_amount = to_number(message.text)
refill_method = (await state.get_data())['here_refill_method']
refill_method = (await state.get_data())["here_refill_method"]
await state.clear()
# Генерация платежа
@@ -95,14 +97,7 @@ async def refill_amount_get(message: Message, bot: Bot, state: FSM, arSession: A
update=cache_message,
)
).bill(refill_amount)
elif refill_method == "Yoomoney":
bill_message, bill_link, bill_receipt = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
update=cache_message,
)
).bill(refill_amount)
elif refill_method == "Stars":
bill_message, bill_link, bill_receipt = await (
await StarsAPI.connect(
@@ -130,48 +125,13 @@ async def refill_amount_get(message: Message, bot: Bot, state: FSM, arSession: A
################################################################################
############################### ПРОВЕРКА ПЛАТЕЖЕЙ ##############################
# Проверка оплаты - ЮMoney
@router.callback_query(F.data.startswith('Pay:Yoomoney'))
async def refill_check_yoomoney(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
pay_method = call.data.split(":")[1]
pay_receipt = call.data.split(":")[2]
pay_status, pay_amount = await (
await YoomoneyAPI.connect(
bot=bot,
arSession=arSession,
update=call,
)
).bill_check(pay_receipt)
if pay_status == 0:
refill_status = await refill_success(
bot=bot,
call=call,
pay_method=pay_method,
pay_amount=pay_amount,
pay_receipt=int(pay_receipt),
pay_comment=pay_receipt,
)
if refill_status == "ALREADY":
await call.answer("❗ Ваше пополнение уже зачислено.", True, cache_time=60)
await delete_refill_message(bot, call.message.chat.id, call.message.message_id)
elif refill_status == "USER_NOT_FOUND":
await call.answer("❗ Пользователь не найден. Напишите в поддержку.", True, cache_time=30)
elif pay_status == 1:
await call.answer("❗️ Не удалось проверить платёж. Попробуйте позже", True, cache_time=30)
elif pay_status == 2:
await call.answer("❗️ Оплата не была найдена. Попробуйте позже", True, cache_time=5)
elif pay_status == 3:
await call.answer("❗️ Оплата была произведена не в рублях", True, cache_time=5)
else:
await call.answer(f"❗ Неизвестная ошибка {pay_status}. Обратитесь в поддержку.", True, cache_time=5)
# Проверка оплаты - Cryptobot
@router.callback_query(F.data.startswith('Pay:Cryptobot'))
async def refill_check_cryptobot(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
@router.callback_query(F.data.startswith("Pay:Cryptobot"))
async def refill_check_cryptobot(
call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS
):
pay_method = call.data.split(":")[1]
pay_comment = call.data.split(":")[2]
@@ -194,22 +154,34 @@ async def refill_check_cryptobot(call: CallbackQuery, bot: Bot, state: FSM, arSe
if refill_status == "ALREADY":
await call.answer("❗ Ваше пополнение уже зачислено.", True, cache_time=60)
await delete_refill_message(bot, call.message.chat.id, call.message.message_id)
await delete_refill_message(
bot, call.message.chat.id, call.message.message_id
)
elif refill_status == "USER_NOT_FOUND":
await call.answer("❗ Пользователь не найден. Напишите в поддержку.", True, cache_time=30)
await call.answer(
"❗ Пользователь не найден. Напишите в поддержку.", True, cache_time=30
)
elif pay_status == 1:
await call.answer("❗️ Не удалось проверить платёж. Попробуйте позже", True, cache_time=30)
await call.answer(
"❗️ Не удалось проверить платёж. Попробуйте позже", True, cache_time=30
)
elif pay_status == 2:
await call.answer("❗️ Оплата не была найдена. Попробуйте позже", True, cache_time=5)
await call.answer(
"❗️ Оплата не была найдена. Попробуйте позже", True, cache_time=5
)
elif pay_status == 3:
await call.answer("❗️ Вы не успели оплатить счёт", True, cache_time=5)
await call.message.edit_reply_markup()
else:
await call.answer(f"❗ Неизвестная ошибка {pay_status}. Обратитесь в поддержку.", True, cache_time=5)
await call.answer(
f"❗ Неизвестная ошибка {pay_status}. Обратитесь в поддержку.",
True,
cache_time=5,
)
# Проверка оплаты - Звёзды
@router.callback_query(F.data.startswith('Pay:Stars'))
@router.callback_query(F.data.startswith("Pay:Stars"))
async def refill_check_stars(call: CallbackQuery, bot: Bot, state: FSM, arSession: ARS):
pay_method = call.data.split(":")[1]
pay_receipt = int(call.data.split(":")[2])
@@ -233,22 +205,36 @@ async def refill_check_stars(call: CallbackQuery, bot: Bot, state: FSM, arSessio
if refill_status == "ALREADY":
await call.answer("❗ Ваше пополнение уже зачислено.", True, cache_time=60)
await delete_refill_message(bot, call.message.chat.id, call.message.message_id)
await delete_refill_message(
bot, call.message.chat.id, call.message.message_id
)
elif refill_status == "USER_NOT_FOUND":
await call.answer("❗ Пользователь не найден. Напишите в поддержку.", True, cache_time=30)
await call.answer(
"❗ Пользователь не найден. Напишите в поддержку.", True, cache_time=30
)
elif pay_status == 1:
await call.answer("❗️ Не удалось проверить платёж. Попробуйте позже", True, cache_time=30)
await call.answer(
"❗️ Не удалось проверить платёж. Попробуйте позже", True, cache_time=30
)
elif pay_status == 2:
await call.answer("❗️ Оплата не была найдена. Попробуйте позже", True, cache_time=5)
await call.answer(
"❗️ Оплата не была найдена. Попробуйте позже", True, cache_time=5
)
else:
await call.answer(f"❗ Неизвестная ошибка {pay_status}. Обратитесь в поддержку.", True, cache_time=5)
await call.answer(
f"❗ Неизвестная ошибка {pay_status}. Обратитесь в поддержку.",
True,
cache_time=5,
)
################################################################################
#################################### ЗВЁЗДЫ ####################################
# Подтверждение платежа Telegram Stars
@router.pre_checkout_query()
async def refill_stars_pre_checkout(query: PreCheckoutQuery, bot: Bot, state: FSM, arSession: ARS):
async def refill_stars_pre_checkout(
query: PreCheckoutQuery, bot: Bot, state: FSM, arSession: ARS
):
await (
await StarsAPI.connect(
bot=bot,
@@ -277,7 +263,9 @@ async def refill_stars_success(message: Message, bot: Bot, state: FSM, arSession
stars_api.parse_successful_payment(payment)
)
except ValueError:
bot_logger.warning("Некорректная successful_payment для Telegram Stars", exc_info=True)
bot_logger.warning(
"Некорректная successful_payment для Telegram Stars", exc_info=True
)
return
refill_status, receipt = await save_refill_success(
@@ -293,12 +281,10 @@ async def refill_stars_success(message: Message, bot: Bot, state: FSM, arSession
if bill_chat_id == message.chat.id:
await delete_refill_message(bot, bill_chat_id, bill_message_id)
await message.answer(
ded(f"""
await message.answer(ded(f"""
<b>💰 Вы пополнили баланс на сумму <code>{pay_amount}₽</code>. Удачи ❤️
🧾 Чек: <code>#{receipt}</code></b>
""")
)
"""))
elif refill_status == "ALREADY":
if bill_chat_id == message.chat.id:
await delete_refill_message(bot, bill_chat_id, bill_message_id)
@@ -312,12 +298,12 @@ async def refill_stars_success(message: Message, bot: Bot, state: FSM, arSession
#################################### ПРОЧЕЕ ####################################
# Зачисление средств
async def refill_success(
bot: Bot,
call: CallbackQuery,
pay_method: str,
pay_amount: float,
pay_receipt: Optional[int] = None,
pay_comment: Optional[str] = None,
bot: Bot,
call: CallbackQuery,
pay_method: str,
pay_amount: float,
pay_receipt: Optional[int] = None,
pay_comment: Optional[str] = None,
):
user_id = call.from_user.id
@@ -338,19 +324,19 @@ async def refill_success(
if response_success != "ok":
return response_success
await call.message.answer(
ded(f"""
await call.message.answer(ded(f"""
<b>💰 Вы пополнили баланс на сумму <code>{pay_amount}₽</code>. Удачи ❤️
🧾 Чек: <code>#{receipt}</code></b>
""")
)
"""))
await delete_refill_message(bot, call.message.chat.id, call.message.message_id)
return response_success
# Удаление сообщения со счётом
async def delete_refill_message(bot: Bot, chat_id: Optional[int], message_id: Optional[int]) -> None:
async def delete_refill_message(
bot: Bot, chat_id: Optional[int], message_id: Optional[int]
) -> None:
if chat_id is None or message_id is None:
return
@@ -362,16 +348,14 @@ async def delete_refill_message(bot: Bot, chat_id: Optional[int], message_id: Op
# Сохранение пополнения и уведомление админов
async def save_refill_success(
bot: Bot,
user_id: int,
pay_method: str,
pay_amount: float,
pay_receipt: int,
pay_comment: str,
bot: Bot,
user_id: int,
pay_method: str,
pay_amount: float,
pay_receipt: int,
pay_comment: str,
) -> Tuple[str, int]:
if pay_method == "Yoomoney":
text_method = "ЮMoney"
elif pay_method == "Cryptobot":
if pay_method == "Cryptobot":
text_method = "CryptoBot"
elif pay_method == "Stars":
text_method = "Telegram Stars"
@@ -401,7 +385,7 @@ async def save_refill_success(
▪️ Пользователь: <b>@{get_user.user_login}</b> | <a href='tg://user?id={user_id}'>{get_user.user_name}</a> | <code>{user_id}</code>
▪️ Сумма пополнения: <code>{pay_amount}₽</code> <code>({text_method})</code>
▪️ Чек: <code>#{pay_receipt}</code>
""")
"""),
)
return response_success, pay_receipt
tgbot/services/api_discord.py
-239
View File
@@ -1,239 +0,0 @@
# - *- coding: utf- 8 - *-
import asyncio
import json
from io import BytesIO
from typing import Any, Dict, Optional, Tuple, Union
import ujson
from aiogram import Bot
from aiogram.types import CallbackQuery, Message
from aiohttp import ClientConnectorCertificateError, FormData
from tgbot.database import Settingsx
from tgbot.utils.const_functions import gen_id, send_errors
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import ARS
from tgbot.utils.misc_functions import send_admins
class DiscordAPI:
# Настройка клиента Discord webhook
def __init__(
self,
bot: Bot,
arSession: ARS,
update: Optional[Union[Message, CallbackQuery]] = None,
webhook_url: str = "None",
adding: bool = False,
skipping_error: bool = False,
):
self.bot = bot
self.arSession = arSession
self.update = update
self.adding = adding
self.skipping_error = skipping_error
self.webhook_username = "Djimbo Shop | Free Bot"
self.base_url = "https://djimbo.dev/dsapi"
webhook_url = self._normalize_webhook_url(webhook_url)
if "/" in webhook_url:
self.webhook_id = webhook_url.split("/")[0]
self.webhook_token = webhook_url.split("/")[1]
else:
self.webhook_id = ""
self.webhook_token = ""
# Нормализация Discord webhook URL
@staticmethod
def _normalize_webhook_url(webhook_url: str) -> str:
if webhook_url is None:
return "None"
if webhook_url.startswith("https://discord.com/api/"):
webhook_url = webhook_url[33:]
if webhook_url.startswith("discord.com/api/webhooks/"):
webhook_url = webhook_url[25:]
return webhook_url
# Инициализация данных
@classmethod
async def connect(
cls,
bot: Bot,
arSession: ARS,
update: Optional[Union[Message, CallbackQuery]] = None,
webhook_url: Optional[str] = None,
skipping_error: bool = False,
) -> "DiscordAPI":
adding = webhook_url is not None
if webhook_url is None:
settings = await Settingsx().get()
webhook_url = settings.misc_discord_webhook_url
adding = False
return cls(
bot=bot,
arSession=arSession,
update=update,
webhook_url=webhook_url,
adding=adding,
skipping_error=skipping_error,
)
# Рассылка админам о нерабочем вебхуке
async def error_account_admin(self, error_code: str = "Unknown"):
bot_logger.warning("Discord webhook недоступен: %s", error_code)
if not self.skipping_error:
await send_admins(
self.bot,
f"<b>🧿 Дискорд вебхук недоступен. Как можно быстрее его замените</b>\n"
f"❗️ Ошибка: <code>{error_code}</code>"
)
# Проверка вебхука
async def check(self) -> Tuple[bool, str]:
request_url = f"{self.base_url}/webhooks/{self.webhook_id}/{self.webhook_token}"
status, response = await self._request(
request_url=request_url,
request_method="GET",
)
if status and "channel_id" in response:
discord_channel_id = response['channel_id']
discord_hook_name = response['name']
return True, discord_hook_name
return False, ""
# Загрузка фотографий
async def upload_photo(self, photo_data: Union[BytesIO, bytes], photo_name: Optional[str] = None) -> Tuple[
bool, str]:
request_url = f"{self.base_url}/webhooks/{self.webhook_id}/{self.webhook_token}"
if photo_name is None:
photo_name = str(gen_id(24))
if not photo_name.endswith(".png") and not photo_name.endswith(".jpg"):
photo_name = f"{photo_name}.png"
send_json = {
'username': self.webhook_username,
'content': '',
}
data = FormData()
data.add_field('file', photo_data, filename=photo_name)
data.add_field('payload_json', ujson.dumps(send_json))
await asyncio.sleep(1)
status, response = await self._request(
request_url=request_url,
request_method="POST",
request_data=data,
)
if "id" in response:
channel_id = response['channel_id']
message_id = response['id']
get_discord_forevercdn = await (
DiscordDJ(
arSession=self.arSession,
bot=self.bot,
)
).export_forevercdn()
photo_url = f"{get_discord_forevercdn}/attachments/{channel_id}/{message_id}"
return True, photo_url
return False, "None"
# Запрос
async def _request(
self,
request_url: str,
request_method: str,
request_data: Optional[Union[Dict[str, Any], FormData]] = None,
) -> Tuple[bool, Any]:
session = await self.arSession.get_session()
await asyncio.sleep(1)
try:
response = await session.request(
method=request_method,
url=request_url,
data=request_data,
headers={"Accept-Encoding": "gzip, deflate"},
)
response_data = json.loads((await response.read()).decode())
if response.status == 200:
return True, response_data
else:
await self.error_account_admin(f"{response.status} - {str(response_data)}")
return False, response_data
except ClientConnectorCertificateError:
bot_logger.warning("Ошибка SSL при запросе Discord webhook", exc_info=True)
await self.error_account_admin("CERTIFICATE_VERIFY_FAILED")
return False, "CERTIFICATE_VERIFY_FAILED"
except Exception as ex:
bot_logger.warning("Ошибка запроса Discord webhook", exc_info=True)
await self.error_account_admin(str(ex))
return False, str(ex)
# Извлечение ссылок для работы с локальным АПИ дискорда
class DiscordDJ:
# Настройка клиента сервисных ссылок Discord
def __init__(self, arSession: ARS, bot: Bot):
self.arSession = arSession
self.bot = bot
self.const_url = "https://djimbo.dev/autoshop_discord.json"
# Экспорт публичного дискорд вебхука
async def export_webhook(self) -> str:
session = await self.arSession.get_session()
try:
response = await session.get(
self.const_url,
headers={"Accept-Encoding": "gzip, deflate"},
)
response_data = json.loads((await response.read()).decode())
except Exception as ex:
await send_errors(self.bot, 7729051, f"Error getting Discord Webhook - {ex}")
return "None"
else:
return response_data['webhook']
# Экспорт ссылки на постоянный CDN
async def export_forevercdn(self) -> str:
session = await self.arSession.get_session()
try:
response = await session.get(
self.const_url,
headers={"Accept-Encoding": "gzip, deflate"},
)
response_data = json.loads((await response.read()).decode())
except Exception as ex:
await send_errors(self.bot, 7729051, f"Error getting Discord ForeverCDN - {ex}")
return "None"
else:
return response_data['forevercdn']
tgbot/services/api_hosting_text.py
+6 -88
View File
@@ -16,19 +16,16 @@ from tgbot.utils.misc.bot_models import ARS
@dataclass
class ModelHostingText:
telegraph: str = "telegraph"
pastie: str = "pastie"
friendpaste: str = "friendpaste"
snippet: str = "snippet"
# API для работы с текстовыми хостингами
class HostingAPI:
# Настройка клиента текстового хостинга
def __init__(
self,
arSession: ARS,
bot: Bot,
text_hosting: str,
self,
arSession: ARS,
bot: Bot,
text_hosting: str,
):
self.arSession = arSession
self.bot = bot
@@ -42,7 +39,7 @@ class HostingAPI:
return cls(
arSession=arSession,
bot=bot,
text_hosting=settings.misc_hosting_text, # telegraph, pastie, friendpaste, snippet
text_hosting=settings.misc_hosting_text, # telegraph
)
# Загрузка текста на хостинг
@@ -67,89 +64,10 @@ class HostingAPI:
await send_errors(self.bot, 4044321, str(response))
status_success = False
############################################################
########################## PASTIE ##########################
elif self.text_hosting == ModelHostingText.pastie:
try:
response = await session.request(
method="post",
url="http://pastie.org/pastes/create/",
data={
'language': 'plaintext',
'content': text,
},
)
except Exception as ex:
bot_logger.warning("Ошибка загрузки текста в Pastie", exc_info=True)
await send_errors(self.bot, 4719012, str(ex))
status_success = False
else:
cache_link = response.url
if "create" in str(cache_link) or str(cache_link) == "http://pastie.org/":
status_success = False
else:
return_link = cache_link
############################################################
######################## FRIENDPASTE #######################
elif self.text_hosting == ModelHostingText.friendpaste:
try:
response = await session.request(
method="post",
url="https://www.friendpaste.com/",
json={
'language': 'text',
'title': '',
'snippet': text,
},
)
cache_link = json.loads((await response.read()).decode())['url']
except Exception as ex:
bot_logger.warning("Ошибка загрузки текста в FriendPaste", exc_info=True)
await send_errors(self.bot, 8434711, str(ex))
status_success = False
else:
return_link = cache_link
############################################################
######################### SNIPPET ##########################
elif self.text_hosting == ModelHostingText.snippet:
try:
response = await session.request(
method="post",
url="https://snippet.host/",
data={
'title': '',
'content': text,
'visibility': '1',
'expires': 'never',
'language': 'plain text'
},
)
cache_link = response.url
except Exception as ex:
bot_logger.warning("Ошибка загрузки текста в Snippet", exc_info=True)
await send_errors(self.bot, 8900012, str(ex))
status_success = False
else:
return_link = cache_link
if status_success:
return str(return_link)
# pastie -> friendpaste
if self.text_hosting == ModelHostingText.pastie:
self.text_hosting = ModelHostingText.friendpaste
# friendpaste -> snippet
elif self.text_hosting == ModelHostingText.friendpaste:
self.text_hosting = ModelHostingText.snippet
# snippet -> telegraph
elif self.text_hosting == ModelHostingText.snippet:
self.text_hosting = ModelHostingText.telegraph
# telegraph -> pastie
elif self.text_hosting == ModelHostingText.telegraph:
self.text_hosting = ModelHostingText.pastie
self.text_hosting = ModelHostingText.telegraph
if attempt < max_attempts - 1:
await asyncio.sleep(3)
tgbot/services/api_yoomoney.py
-339
View File
@@ -1,339 +0,0 @@
# - *- coding: utf- 8 - *-
import json
from typing import Any, Dict, Optional, Tuple, Union
from urllib.parse import urlencode
from aiogram import Bot
from aiogram.types import CallbackQuery, Message
from aiohttp import ClientConnectorCertificateError
from tgbot.data.config import YOOMONEY_CLIENT_ID
from tgbot.database import Paymentsx
from tgbot.utils.const_functions import ded, gen_id
from tgbot.utils.misc.bot_logging import bot_logger
from tgbot.utils.misc.bot_models import ARS
from tgbot.utils.misc_functions import send_admins
# АПИ для работы с ЮMoney
class YoomoneyAPI:
# Настройка клиента ЮMoney
def __init__(
self,
bot: Bot,
arSession: ARS,
update: Optional[Union[Message, CallbackQuery]] = None,
token: str = "None",
adding: bool = False,
skipping_error: bool = False,
):
self.token = token
self.adding = adding
self.base_url = 'https://yoomoney.ru/api/'
self.headers = {
'Authorization': f'Bearer {self.token}',
'Content-Type': 'application/x-www-form-urlencoded',
}
self.bot = bot
self.arSession = arSession
self.update = update
self.skipping_error = skipping_error
# Инициализация данных
@classmethod
async def connect(
cls,
bot: Bot,
arSession: ARS,
update: Optional[Union[Message, CallbackQuery]] = None,
token: Optional[str] = None,
skipping_error: bool = False,
) -> "YoomoneyAPI":
adding = token is not None
if token is None:
payments = await Paymentsx().get()
token = payments.yoomoney_token
adding = False
return cls(
bot=bot,
arSession=arSession,
update=update,
token=token,
adding=adding,
skipping_error=skipping_error,
)
# Уведомления о неработоспособности кассы/кошелька
async def error_notification(self, error_code: str = "Unknown"):
bot_logger.warning("ЮMoney недоступен: %s", error_code)
if not self.skipping_error:
if self.adding and self.update is not None:
await self.update.edit_text(
f"<b>🔮 Не удалось добавить ЮMoney кассу ❌</b>\n"
f"❗️ Ошибка: <code>{error_code}</code>"
)
else:
await send_admins(
self.bot,
f"<b>🔮 ЮMoney недоступен. Как можно быстрее его замените</b>\n"
f"❗️ Ошибка: <code>{error_code}</code>"
)
# Проверка кассы/кошелька
async def check(self) -> str:
status, response = await self._request("account-info")
if status:
if len(response) >= 1:
if response['identified']:
text_identified = "Присутствует"
else:
text_identified = "Отсутствует"
if response['account_status'] == "identified":
text_status = "Идентифицированный счет"
elif response['account_status'] == "anonymous":
text_status = "Анонимный счет"
elif response['account_status'] == "named":
text_status = "Именной счет"
else:
text_status = response['account_status']
if response['account_type'] == "personal":
text_type = "Пользовательский счет"
elif response['account_type'] == "professional":
text_type = "Профессиональный счет"
else:
text_type = response['account_type']
return ded(f"""
<b>🔮 ЮMoney кошелёк полностью функционирует ✅</b>
➖➖➖➖➖➖➖➖➖➖
▪️ Кошелёк: <code>{response['account']}</code>
▪️ Идентификация: <code>{text_identified}</code>
▪️ Статус аккаунта: <code>{text_status}</code>
▪️ Тип счета: <code>{text_type}</code>
""")
return "<b>🔮 Не удалось проверить ЮMoney кошелёк ❌</b>"
# Получение баланса
async def balance(self) -> str:
status, response = await self._request("account-info")
if status:
wallet_balance = response['balance']
wallet_status, wallet_number = await self.account_info()
if wallet_status:
return ded(f"""
<b>🔮 Баланс ЮMoney кошелька составляет</b>
➖➖➖➖➖➖➖➖➖➖
▪️ Кошелёк: <code>{wallet_number}</code>
▪️ Баланс: <code>{wallet_balance}₽</code>
""")
return "<b>🔮 Не удалось получить баланс ЮMoney кошелька ❌</b>"
# Информация об аккаунте
async def account_info(self) -> Tuple[bool, str]:
status, response = await self._request("account-info")
try:
return True, response['account']
except Exception:
bot_logger.warning("Не удалось получить номер ЮMoney", exc_info=True)
return False, ""
# Получение ссылки на авторизацию
async def authorization_get(self) -> str:
if not YOOMONEY_CLIENT_ID:
return "В .env не заполнен YOOMONEY_CLIENT_ID"
session = await self.arSession.get_session()
headers = {
'Content-Type': 'application/x-www-form-urlencoded'
}
url = "https://yoomoney.ru/oauth/authorize?" + urlencode({
"client_id": YOOMONEY_CLIENT_ID,
"response_type": "code",
"redirect_uri": "https://yoomoney.ru",
"scope": "account-info operation-history operation-details",
})
response = await session.post(
url=url,
headers=headers,
)
return str(response.url)
# Принятие кода авторизации и получение токена
async def authorization_enter(self, get_code: str) -> Tuple[bool, str, str]:
if not YOOMONEY_CLIENT_ID:
return False, "", "<b>❌ В .env не заполнен YOOMONEY_CLIENT_ID</b>"
session = await self.arSession.get_session()
headers = {
'Content-Type': 'application/x-www-form-urlencoded'
}
url = "https://yoomoney.ru/oauth/token?" + urlencode({
"code": get_code,
"client_id": YOOMONEY_CLIENT_ID,
"grant_type": "authorization_code",
"redirect_uri": "https://yoomoney.ru",
})
response = await session.post(
url=url,
headers=headers,
)
response_data = json.loads((await response.read()).decode())
if "error" in response_data:
error = response_data['error']
if error == "invalid_request":
return_message = ded(f"""
<b>❌ Требуемые параметры запроса отсутствуют или имеют неправильные или недопустимые значения</b>
""")
elif error == "unauthorized_client":
return_message = ded(f"""
<b>❌ Недопустимое значение параметра 'client_id' или 'client_secret', или приложение
не имеет права запрашивать авторизацию (например, ЮMoney заблокировал его 'client_id')</b>
""")
elif error == "invalid_grant":
return_message = ded(f"""
<b>❌ В выпуске 'access_token' отказано. ЮMoney не выпускал временный токен,
срок действия токена истек или этот временный токен уже выдан
'access_token' (повторный запрос токена авторизации с тем же временным токеном)</b>
""")
else:
return_message = f"Unknown error: {error}"
return False, "", return_message
elif response_data['access_token'] == "":
return False, "", "<b>❌ Не удалось получить токен. Попробуйте всё снова</b>"
return True, response_data['access_token'], "<b>🔮 ЮMoney кошелёк был успешно изменён ✅</b>"
# Создание счета на оплату
async def bill(self, pay_amount: Union[float, int]) -> Tuple[Union[str, bool], str, str]:
session = await self.arSession.get_session()
bill_receipt = str(gen_id(12))
url = "https://yoomoney.ru/quickpay/confirm.xml?"
wallet_status, wallet_number = await self.account_info()
if wallet_status:
pay_amount_bill = pay_amount + (pay_amount * 0.031)
if float(pay_amount_bill) < 2:
pay_amount_bill = 2.04
payload = {
'receiver': wallet_number,
'quickpay_form': 'button',
'targets': 'Добровольное пожертвование',
'paymentType': 'SB',
'sum': pay_amount_bill,
'label': bill_receipt,
}
for value in payload:
url += str(value).replace("_", "-") + "=" + str(payload[value])
url += "&"
bill_link = str((await session.post(url[:-1].replace(" ", "%20"))).url)
bill_message = ded(f"""
<b>💰 Пополнение баланса</b>
➖➖➖➖➖➖➖➖➖➖
▪️ Для пополнения баланса, нажмите на кнопку ниже
<code>Перейти к оплате</code> и оплатите выставленный вам счёт
▪️ У вас имеется 60 минут на оплату счета
▪️ Сумма пополнения: <code>{pay_amount}₽</code>
➖➖➖➖➖➖➖➖➖➖
❗️ После оплаты, нажмите на <code>Проверить оплату</code>
""")
return bill_message, bill_link, bill_receipt
return False, "", ""
# Проверка счета на оплату
async def bill_check(self, bill_receipt: Optional[Union[str, int]] = None, records: int = 1) -> Tuple[int, float]:
data = {
'type': 'deposition',
'details': 'true',
}
if bill_receipt is not None:
data['label'] = bill_receipt
if records is not None:
data['records'] = str(records)
status, response = await self._request("operation-history", data)
pay_status, pay_amount, pay_currency = 1, 0, 0
if status:
pay_status = 2
if len(response['operations']) >= 1:
pay_currency = response['operations'][0]['amount_currency']
pay_amount = response['operations'][0]['amount']
pay_status = 3
if pay_currency == "RUB":
pay_status = 0
return pay_status, pay_amount
# Генерация запроса
async def _request(
self,
method: str,
data: Optional[Dict[str, Any]] = None,
) -> Tuple[bool, Any]:
session = await self.arSession.get_session()
url = self.base_url + method
try:
response = await session.post(
url=url,
headers=self.headers,
data=data,
)
response_data = json.loads((await response.read()).decode())
if response.status == 200:
return True, response_data
else:
await self.error_notification(f"{response.status} - {str(response_data)}")
return False, response_data
except ClientConnectorCertificateError:
bot_logger.warning("Ошибка SSL при запросе ЮMoney", exc_info=True)
await self.error_notification("CERTIFICATE_VERIFY_FAILED")
return False, "CERTIFICATE_VERIFY_FAILED"
except Exception as ex:
bot_logger.warning("Ошибка запроса ЮMoney", exc_info=True)
await self.error_notification(str(ex))
return False, str(ex)
tgbot/utils/const_functions.py
+36 -37
View File
@@ -29,13 +29,13 @@ def rkb(text: str) -> KeyboardButton:
# Быстрая сборка inline-кнопки
def ikb(
text: str,
data: Optional[str] = None,
url: Optional[str] = None,
switch: Optional[str] = None,
web: Optional[str] = None,
copy: Optional[str] = None,
login: Optional[str] = None,
text: str,
data: Optional[str] = None,
url: Optional[str] = None,
switch: Optional[str] = None,
web: Optional[str] = None,
copy: Optional[str] = None,
login: Optional[str] = None,
) -> InlineKeyboardButton:
if data is not None:
return InlineKeyboardButton(text=text, callback_data=data)
@@ -61,36 +61,27 @@ async def del_message(message: Message) -> None:
bot_logger.debug("Не удалось удалить сообщение", exc_info=True)
# Отправка фото или обычного сообщения
# Отправка обычного сообщения
async def smart_message(
bot: Bot,
user_id: int,
text: str,
keyboard: Optional[Union[InlineKeyboardMarkup, ReplyKeyboardMarkup]] = None,
photo: Optional[str] = None,
bot: Bot,
user_id: int,
text: str,
keyboard: Optional[Union[InlineKeyboardMarkup, ReplyKeyboardMarkup]] = None,
) -> None:
if photo is not None and photo.title() != "None":
await bot.send_photo(
chat_id=user_id,
photo=photo,
caption=text,
reply_markup=keyboard,
)
else:
await bot.send_message(
chat_id=user_id,
text=text,
reply_markup=keyboard,
)
await bot.send_message(
chat_id=user_id,
text=text,
reply_markup=keyboard,
)
# Отправка сообщения всем админам
async def send_admins(
bot: Bot,
text: str,
keyboard: Optional[InlineKeyboardMarkup] = None,
markup: Optional[InlineKeyboardMarkup] = None,
not_me: int = 0,
bot: Bot,
text: str,
keyboard: Optional[InlineKeyboardMarkup] = None,
markup: Optional[InlineKeyboardMarkup] = None,
not_me: int = 0,
) -> None:
reply_markup = markup or keyboard
@@ -104,7 +95,9 @@ async def send_admins(
disable_web_page_preview=True,
)
except Exception:
bot_logger.warning("Не удалось отправить сообщение админу %s", admin, exc_info=True)
bot_logger.warning(
"Не удалось отправить сообщение админу %s", admin, exc_info=True
)
# Логирование ошибки и отправка админам
@@ -120,8 +113,10 @@ def ded(get_text: str) -> str:
if get_text is not None:
split_text = get_text.split("\n")
if split_text[0] == "": split_text.pop(0)
if split_text[-1] == "": split_text.pop()
if split_text[0] == "":
split_text.pop(0)
if split_text[-1] == "":
split_text.pop()
save_text = []
for text in split_text:
@@ -163,7 +158,7 @@ def convert_list(get_lists: List[list]) -> list:
# Разделение списка на части нужного размера
def split_list(get_list: list, count: int) -> List[list]:
return [get_list[i:i + count] for i in range(0, len(get_list), count)]
return [get_list[i : i + count] for i in range(0, len(get_list), count)]
# Старое имя для разделения сообщений
@@ -198,9 +193,13 @@ def convert_date(from_time, full=True, second=True) -> Union[str, int]:
from_timestamp = int(from_time)
if full:
return datetime.fromtimestamp(from_timestamp, bot_timezone).strftime("%d.%m.%Y %H:%M:%S")
return datetime.fromtimestamp(from_timestamp, bot_timezone).strftime(
"%d.%m.%Y %H:%M:%S"
)
if second:
return datetime.fromtimestamp(from_timestamp, bot_timezone).strftime("%d.%m.%Y %H:%M")
return datetime.fromtimestamp(from_timestamp, bot_timezone).strftime(
"%d.%m.%Y %H:%M"
)
return datetime.fromtimestamp(from_timestamp, bot_timezone).strftime("%d.%m.%Y")
tgbot/utils/misc_functions.py
+30 -15
View File
@@ -7,8 +7,13 @@ from typing import Union
from aiogram import Bot
from aiogram.types import FSInputFile, CallbackQuery, Message
from tgbot.data.config import BOT_DATABASE_EXPORT, BOT_STATUS_NOTIFICATION, BOT_VERSION, PATH_DATABASE, get_admins, \
get_text_desc
from tgbot.data.config import (
BOT_DATABASE_EXPORT,
BOT_STATUS_NOTIFICATION,
BOT_VERSION,
PATH_DATABASE,
get_admins,
)
from tgbot.database import Userx, Settingsx
from tgbot.utils.const_functions import get_unix, get_date, ded, send_admins
from tgbot.utils.misc.bot_logging import bot_logger
@@ -40,9 +45,17 @@ async def autosettings_unix():
now_month = datetime.now().month
now_year = datetime.now().year
unix_day = int(datetime.strptime(f"{now_day}.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S").timestamp())
unix_day = int(
datetime.strptime(
f"{now_day}.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S"
).timestamp()
)
unix_week = unix_day - (now_week * 86400)
unix_month = int(datetime.strptime(f"1.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S").timestamp())
unix_month = int(
datetime.strptime(
f"1.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S"
).timestamp()
)
await Settingsx().update(
misc_profit_day=unix_day,
@@ -68,8 +81,6 @@ async def startup_notify(bot: Bot, arSession: ARS):
ded(f"""
<b>✅ Бот был успешно запущен</b>
➖➖➖➖➖➖➖➖➖➖
{get_text_desc()}
➖➖➖➖➖➖➖➖➖➖
<code>❗ Данное сообщение видят только администраторы бота.</code>
"""),
)
@@ -91,7 +102,9 @@ async def autobackup_admin(bot: Bot):
disable_notification=True,
)
except Exception:
bot_logger.warning("Не удалось отправить автобэкап админу %s", admin, exc_info=True)
bot_logger.warning(
"Не удалось отправить автобэкап админу %s", admin, exc_info=True
)
# Проверка наличия обновлений бота
@@ -106,7 +119,7 @@ async def check_update(bot: Bot, arSession: ARS):
response_data = json.loads((await response.read()).decode())
if float(response_data['version']) > float(BOT_VERSION):
if float(response_data["version"]) > float(BOT_VERSION):
await send_admins(
bot,
ded(f"""
@@ -132,7 +145,7 @@ async def check_mail(bot: Bot, arSession: ARS):
)
response_data = json.loads((await response.read()).decode())
if response_data['status']:
if response_data["status"]:
await send_admins(
bot,
ded(f"""
@@ -176,21 +189,23 @@ async def functions_mail_make(bot: Bot, message: Message, call: CallbackQuery):
users_receive += 1
except Exception:
users_block += 1
bot_logger.debug("Пользователь %s не получил рассылку", user.user_id, exc_info=True)
bot_logger.debug(
"Пользователь %s не получил рассылку", user.user_id, exc_info=True
)
users_count += 1
if users_count % 10 == 0:
await call.message.edit_text(f"<b>📢 Рассылка началась... ({users_count}/{len(get_users)})</b>")
await call.message.edit_text(
f"<b>📢 Рассылка началась... ({users_count}/{len(get_users)})</b>"
)
await asyncio.sleep(0.07)
await call.message.edit_text(
ded(f"""
await call.message.edit_text(ded(f"""
<b>📢 Рассылка была завершена за <code>{get_unix() - get_time}сек</code></b>
➖➖➖➖➖➖➖➖➖➖
👤 Всего пользователей: <code>{len(get_users)}</code>
✅ Пользователей получило сообщение: <code>{users_receive}</code>
❌ Пользователей не получило сообщение: <code>{users_block}</code>
""")
)
"""))
tgbot/utils/text_functions.py
+101 -38
View File
@@ -21,7 +21,11 @@ from tgbot.database import (
ModelUser,
)
from tgbot.keyboards.inline_admin import profile_edit_finl
from tgbot.keyboards.inline_admin_products import position_edit_open_finl, category_edit_open_finl, item_delete_finl
from tgbot.keyboards.inline_admin_products import (
position_edit_open_finl,
category_edit_open_finl,
item_delete_finl,
)
from tgbot.keyboards.inline_user import user_profile_finl
from tgbot.keyboards.inline_user_products import products_open_finl
from tgbot.services.api_hosting_text import HostingAPI
@@ -68,7 +72,7 @@ async def position_open_user(bot: Bot, user_id: int, position_id: int, remover:
await bot.send_message(
chat_id=user_id,
text=ded(f"""
<b>🎁 Покупка товара</b>{hide_link(get_position.position_photo)}
<b>🎁 Покупка товара</b>
➖➖➖➖➖➖➖➖➖➖
▪️ Название: <code>{get_position.position_name}</code>
▪️ Категория: <code>{get_category.category_name}</code>
@@ -78,7 +82,6 @@ async def position_open_user(bot: Bot, user_id: int, position_id: int, remover:
"""),
link_preview_options=LinkPreviewOptions(show_above_text=True),
reply_markup=products_open_finl(position_id, get_position.category_id, remover),
)
@@ -114,10 +117,8 @@ async def open_profile_admin(bot: Bot, user_id: int, get_user: ModelUser):
async def refill_open_admin(bot: Bot, user_id: int, get_refill: ModelRefill):
get_user = await Userx().get_required(user_id=get_refill.user_id)
if get_refill.refill_method in ['Form', 'Nickname', 'Number', 'QIWI']:
if get_refill.refill_method in ["Form", "Nickname", "Number", "QIWI"]:
pay_method = "QIWI 🥝"
elif get_refill.refill_method == "Yoomoney":
pay_method = "ЮMoney 🔮"
elif get_refill.refill_method == "Cryptobot":
pay_method = "CryptoBot 🔷"
else:
@@ -138,7 +139,9 @@ async def refill_open_admin(bot: Bot, user_id: int, get_refill: ModelRefill):
# Открытие покупки админом
async def purchase_open_admin(bot: Bot, arSession: ARS, user_id: int, get_purchase: ModelPurchases):
async def purchase_open_admin(
bot: Bot, arSession: ARS, user_id: int, get_purchase: ModelPurchases
):
get_user = await Userx().get_required(user_id=get_purchase.user_id)
link_items = await (
@@ -172,8 +175,18 @@ async def purchase_open_admin(bot: Bot, arSession: ARS, user_id: int, get_purcha
# Открытие категории админом
async def category_open_admin(bot: Bot, user_id: int, category_id: int, remover: int):
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = 0, 0, 0, 0
profit_count_all, profit_count_day, profit_count_week, profit_count_month = 0, 0, 0, 0
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = (
0,
0,
0,
0,
)
profit_count_all, profit_count_day, profit_count_week, profit_count_month = (
0,
0,
0,
0,
)
get_items = await Itemx().gets(category_id=category_id)
get_category = await Categoryx().get_required(category_id=category_id)
@@ -217,8 +230,18 @@ async def category_open_admin(bot: Bot, user_id: int, category_id: int, remover:
# Открытие позиции админом
async def position_open_admin(bot: Bot, position_id: int, user_id: int):
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = 0, 0, 0, 0
profit_count_all, profit_count_day, profit_count_week, profit_count_month = 0, 0, 0, 0
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = (
0,
0,
0,
0,
)
profit_count_all, profit_count_day, profit_count_week, profit_count_month = (
0,
0,
0,
0,
)
get_items = await Itemx().gets(position_id=position_id)
get_position = await Positionx().get_required(position_id=position_id)
@@ -227,12 +250,6 @@ async def position_open_admin(bot: Bot, position_id: int, user_id: int):
get_settings = await Settingsx().get()
get_purchases = await Purchasesx().gets(purchase_position_id=position_id)
# Наличие фото
if get_position.position_photo != "None":
position_photo_text = "<code>Присутствует ✅</code>"
else:
position_photo_text = "<code>Отсутствует ❌</code>"
# Наличие описания
if get_position.position_desc != "None":
position_desc = f"{get_position.position_desc}"
@@ -257,14 +274,13 @@ async def position_open_admin(bot: Bot, position_id: int, user_id: int):
await bot.send_message(
chat_id=user_id,
text=ded(f"""
<b>📁 Редактирование позиции</b>{hide_link(get_position.position_photo)}
<b>📁 Редактирование позиции</b>
➖➖➖➖➖➖➖➖➖➖
▪️ Категория: <code>{get_category.category_name}</code>
▪️ Позиция: <code>{get_position.position_name}</code>
▪️ Стоимость: <code>{get_position.position_price}₽</code>
▪️ Количество: <code>{len(get_items)}шт</code>
▪️ Дата создания: <code>{convert_date(get_category.category_unix)}</code>
▪️ Изображение: {position_photo_text}
▪️ Описание: {position_desc}
💸 Продаж за День: <code>{profit_count_day}шт</code> - <code>{round(profit_amount_day, 2)}₽</code>
@@ -274,7 +290,6 @@ async def position_open_admin(bot: Bot, position_id: int, user_id: int):
"""),
link_preview_options=LinkPreviewOptions(show_above_text=True),
reply_markup=await position_edit_open_finl(bot, position_id, 0),
)
@@ -303,13 +318,39 @@ async def item_open_admin(bot: Bot, item_id: int, user_id: int):
################################################################################
# Статистика бота
async def get_statistics() -> str:
refill_amount_all, refill_amount_day, refill_amount_week, refill_amount_month = 0, 0, 0, 0
refill_count_all, refill_count_day, refill_count_week, refill_count_month = 0, 0, 0, 0
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = 0, 0, 0, 0
profit_count_all, profit_count_day, profit_count_week, profit_count_month = 0, 0, 0, 0
users_all, users_day, users_week, users_month, users_money_have, users_money_give = 0, 0, 0, 0, 0, 0
refill_amount_all, refill_amount_day, refill_amount_week, refill_amount_month = (
0,
0,
0,
0,
)
refill_count_all, refill_count_day, refill_count_week, refill_count_month = (
0,
0,
0,
0,
)
profit_amount_all, profit_amount_day, profit_amount_week, profit_amount_month = (
0,
0,
0,
0,
)
profit_count_all, profit_count_day, profit_count_week, profit_count_month = (
0,
0,
0,
0,
)
(
users_all,
users_day,
users_week,
users_month,
users_money_have,
users_money_give,
) = (0, 0, 0, 0, 0, 0)
refill_cryptobot_count, refill_cryptobot_amount = 0, 0
refill_yoomoney_count, refill_yoomoney_amount = 0, 0
refill_stars_count, refill_stars_amount = 0, 0
get_categories = await Categoryx().get_all()
@@ -340,10 +381,7 @@ async def get_statistics() -> str:
refill_amount_all += refill.refill_amount
refill_count_all += 1
if refill.refill_method == "Yoomoney":
refill_yoomoney_count += 1
refill_yoomoney_amount += refill.refill_amount
elif refill.refill_method == "Cryptobot":
if refill.refill_method == "Cryptobot":
refill_cryptobot_count += 1
refill_cryptobot_amount += refill.refill_amount
elif refill.refill_method == "Stars":
@@ -375,12 +413,28 @@ async def get_statistics() -> str:
# Даты обновления статистики
all_days = [
'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье',
"Понедельник",
"Вторник",
"Среда",
"Четверг",
"Пятница",
"Суббота",
"Воскресенье",
]
all_months = [
'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь',
'Октябрь', 'Ноябрь', 'Декабрь'
"Январь",
"Февраль",
"Март",
"Апрель",
"Май",
"Июнь",
"Июль",
"Август",
"Сентябрь",
"Октябрь",
"Ноябрь",
"Декабрь",
]
now_day = datetime.now().day
@@ -388,12 +442,22 @@ async def get_statistics() -> str:
now_month = datetime.now().month
now_year = datetime.now().year
unix_day = int(datetime.strptime(f"{now_day}.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S").timestamp())
unix_day = int(
datetime.strptime(
f"{now_day}.{now_month}.{now_year} 0:0:0", "%d.%m.%Y %H:%M:%S"
).timestamp()
)
unix_week = unix_day - (now_week * 86400)
week_day = int(datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).strftime("%d"))
week_month = int(datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).strftime("%m"))
week_week = int(datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).weekday())
week_day = int(
datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).strftime("%d")
)
week_month = int(
datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).strftime("%m")
)
week_week = int(
datetime.fromtimestamp(unix_week, pytz.timezone(BOT_TIMEZONE)).weekday()
)
return ded(f"""
<b>📊 СТАТИСТИКА БОТА</b>
@@ -420,7 +484,6 @@ async def get_statistics() -> str:
┣‒ Платежные системы (всего)
┣ CryptoBot: <code>{refill_cryptobot_count}шт</code> - <code>{round(refill_cryptobot_amount, 2)}₽</code>
┣ TG Stars: <code>{refill_stars_count}шт</code> - <code>{round(refill_stars_amount, 2)}₽</code>
┣ ЮMoney: <code>{refill_yoomoney_count}шт</code> - <code>{round(refill_yoomoney_amount, 2)}₽</code>
┃
┣‒ Остальные
┣ Средств выдано: <code>{round(users_money_give, 2)}₽</code>