From 97996efcdac504c2a9aee5b2c3d3be9e2b44d92a Mon Sep 17 00:00:00 2001 From: vrubelroman Date: Sun, 16 Nov 2025 22:09:37 +0300 Subject: [PATCH] add if else prod or test key telegram --- LichessClientTG_bot/config.py | 25 ++++++++++++++++----- git-pull-reset.sh | 23 ------------------- git-pull-safe.sh | 42 ----------------------------------- 3 files changed, 20 insertions(+), 70 deletions(-) delete mode 100755 git-pull-reset.sh delete mode 100755 git-pull-safe.sh diff --git a/LichessClientTG_bot/config.py b/LichessClientTG_bot/config.py index 9a80eca..fdd5384 100644 --- a/LichessClientTG_bot/config.py +++ b/LichessClientTG_bot/config.py @@ -3,11 +3,26 @@ from dotenv import load_dotenv load_dotenv() -# Telegram Bot Configuration -TELEGRAM_BOT_TOKEN = "8241474807:AAH684LTY93aXRou4-LtqU5-p8LuEjzYn8U" +IS_PROD = False + +# Telegram Bot Configuration (Production) +TELEGRAM_BOT_TOKEN_PROD = "8241474807:AAH684LTY93aXRou4-LtqU5-p8LuEjzYn8U" +# Admin Panel Bot Configuration (Production) +ADMINPANEL_TELEGRAM_BOT_TOKEN_PROD = "7918349610:AAEZH7lbzdams31rCDZXeaAzFluDWfUQoLg" + +# Telegram Bot Configuration (Test) +TELEGRAM_BOT_TOKEN_TEST = "7903295042:AAGBO2k8pfBDy4RoLRFsknwE7z0N-thAPI8" +# Admin Panel Bot Configuration (Test) +ADMINPANEL_TELEGRAM_BOT_TOKEN_TEST = "8588876086:AAHoZncfhTCbul1BblpvnZMzvz7jAYVFmcw" + +# Select tokens based on IS_PROD flag +if IS_PROD: + TELEGRAM_BOT_TOKEN = TELEGRAM_BOT_TOKEN_PROD + ADMINPANEL_TELEGRAM_BOT_TOKEN = ADMINPANEL_TELEGRAM_BOT_TOKEN_PROD +else: + TELEGRAM_BOT_TOKEN = TELEGRAM_BOT_TOKEN_TEST + ADMINPANEL_TELEGRAM_BOT_TOKEN = ADMINPANEL_TELEGRAM_BOT_TOKEN_TEST -# Admin Panel Bot Configuration -ADMINPANEL_TELEGRAM_BOT_TOKEN = "7918349610:AAEZH7lbzdams31rCDZXeaAzFluDWfUQoLg" # Lichess API Configuration LICHESS_API_BASE_URL = "https://lichess.org/api" @@ -34,7 +49,7 @@ DATABASE_PATH = _resolve_database_path() PERIOD_OPTIONS = [0, 15, 30, 60, 120, 180, 360, 720, 1440] # minutes (0=disable, then: 15min, 30min, 1h, 2h, 3h, 6h, 12h, 24h) # Bot Version -BOT_VERSION = "1.0.0" +BOT_VERSION = "1.0.1" # Telegram Bot Long Polling Configuration POLL_INTERVAL = 1.0 # seconds diff --git a/git-pull-reset.sh b/git-pull-reset.sh deleted file mode 100755 index a42bc63..0000000 --- a/git-pull-reset.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# Git pull с отменой локальных изменений в config.py -# Использование: ./git-pull-reset.sh - -CONFIG_FILE="LichessClientTG_bot/config.py" - -echo "🔄 Git pull с отменой локальных изменений в config.py..." - -# Убираем skip-worktree если был установлен -echo "🔓 Отключаю skip-worktree..." -git update-index --no-skip-worktree "$CONFIG_FILE" 2>/dev/null || true - -# Отменяем локальные изменения в config.py -echo "↩️ Отменяю локальные изменения в config.py..." -git checkout -- "$CONFIG_FILE" 2>/dev/null || true - -# Делаем pull -echo "⬇️ Выполняю git pull..." -git pull - -echo "✅ Готово! Локальные изменения в config.py отменены, pull выполнен." - diff --git a/git-pull-safe.sh b/git-pull-safe.sh deleted file mode 100755 index fc075e8..0000000 --- a/git-pull-safe.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# Безопасный git pull с сохранением локального config.py -# Использование: ./git-pull-safe.sh - -CONFIG_FILE="LichessClientTG_bot/config.py" -BACKUP_FILE="${CONFIG_FILE}.local" - -echo "🔄 Безопасный git pull с сохранением локального config.py..." - -# Сохраняем локальный config -if [ -f "$CONFIG_FILE" ]; then - echo "💾 Сохраняю локальный config.py..." - cp "$CONFIG_FILE" "$BACKUP_FILE" -fi - -# Временно убираем skip-worktree -echo "🔓 Временно отключаю skip-worktree..." -git update-index --no-skip-worktree "$CONFIG_FILE" 2>/dev/null || true - -# Восстанавливаем версию из репозитория для pull -echo "📥 Восстанавливаю версию из репозитория для pull..." -git checkout -- "$CONFIG_FILE" 2>/dev/null || true - -# Делаем pull -echo "⬇️ Выполняю git pull..." -git pull - -# Восстанавливаем локальный config -if [ -f "$BACKUP_FILE" ]; then - echo "✅ Восстанавливаю локальный config.py..." - cp "$BACKUP_FILE" "$CONFIG_FILE" - rm "$BACKUP_FILE" -fi - -# Возвращаем skip-worktree -echo "🔒 Возвращаю skip-worktree..." -git update-index --skip-worktree "$CONFIG_FILE" - -echo "✨ Готово! Локальный config.py сохранен." - -