From 9480576966d7c092ec2fa3003f5ff69eafea9952 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 12 Jan 2026 15:33:42 +0100 Subject: [PATCH] fix: update bots' code to match .env keys --- edu_master/phpsessid-bot/bot.py | 29 ++++++++++++++++++--------- edu_master/webinar-checker/checker.py | 25 +++++++++++++++-------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/edu_master/phpsessid-bot/bot.py b/edu_master/phpsessid-bot/bot.py index 48aa466..d74cc76 100644 --- a/edu_master/phpsessid-bot/bot.py +++ b/edu_master/phpsessid-bot/bot.py @@ -12,15 +12,26 @@ logging.basicConfig( ) logger = logging.getLogger(__name__) -# Load configuration -LOGIN = os.getenv('EDU_LOGIN') -PASSWORD = os.getenv('EDU_PASSWORD') -URL_LOGIN = os.getenv('EDU_URL_LOGIN', 'https://edu.edu.vn.ua/user/login') -URL_VERIFY = os.getenv('EDU_URL_VERIFY', 'https://edu.edu.vn.ua/course/userlist') -INTERVAL = int(os.getenv('PHPSESSID_INTERVAL', 10)) -USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') -REDIS_HOST = os.getenv('REDIS_HOST', 'redis') -REDIS_PORT = int(os.getenv('REDIS_PORT', 6379)) +# Load configuration (adapted to .env keys) +def _env(key, default=None): + v = os.getenv(key, default) + if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")): + return v[1:-1] + return v + +LOGIN = _env('KEEPER_LOGIN') +PASSWORD = _env('KEEPER_PASSWORD') + +EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua') +EDU_LOGIN_PATH = _env('EDU_URL_LOGIN', '/user/login') +EDU_COURSES_PATH = _env('EDU_URL_COURSES', '/course/userlist') +URL_LOGIN = f"{EDU_BASE.rstrip('/')}/{EDU_LOGIN_PATH.lstrip('/')}" +URL_VERIFY = f"{EDU_BASE.rstrip('/')}/{EDU_COURSES_PATH.lstrip('/')}" + +INTERVAL = int(_env('KEEPER_INTERVAL', 10)) +USER_AGENT = _env('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') +REDIS_HOST = _env('REDIS_HOST', 'redis') +REDIS_PORT = int(_env('REDIS_PORT', 6379)) SUCCESS_FILE = '/tmp/last_success' diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index 0477481..2efd86a 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -15,14 +15,23 @@ logging.basicConfig( logger = logging.getLogger(__name__) # Load environment variables -WEBINAR_URL = os.getenv('WEBINAR_URL', 'https://edu.edu.vn.ua/webinar/useractive') -WEBINAR_CHECK_INTERVAL = int(os.getenv('WEBINAR_CHECK_INTERVAL', 60)) -REDIS_HOST = os.getenv('REDIS_HOST', 'redis') -REDIS_PORT = int(os.getenv('REDIS_PORT', 6379)) -PLAYWRIGHT_WS = os.getenv('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws') -USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') -WEBINAR_TELEGRAM_TOKEN = os.getenv('WEBINAR_TELEGRAM_TOKEN') -ADMIN_ID = int(os.getenv('WEBINAR_ADMIN_ID', '0')) +def _env(key, default=None): + v = os.getenv(key, default) + if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")): + return v[1:-1] + return v + +EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua') +EDU_WEBINAR_PATH = _env('EDU_URL_WEBINAR', '/webinar/useractive') +WEBINAR_URL = f"{EDU_BASE.rstrip('/')}/{EDU_WEBINAR_PATH.lstrip('/')}" + +WEBINAR_CHECK_INTERVAL = int(_env('WEBINAR_CHECK_INTERVAL', 60)) +REDIS_HOST = _env('REDIS_HOST', 'redis') +REDIS_PORT = int(_env('REDIS_PORT', 6379)) +PLAYWRIGHT_WS = _env('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws') +USER_AGENT = _env('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') +WEBINAR_TELEGRAM_TOKEN = _env('WEBINAR_TELEGRAM_TOKEN') +ADMIN_ID = int(_env('WEBINAR_ADMIN_ID', '0')) # Redis Keys KEY_WHITELIST = "bot:whitelist"