diff --git a/database.py b/database.py index e3abc35..2b14c7c 100644 --- a/database.py +++ b/database.py @@ -149,6 +149,20 @@ async def init_db(): """) logger.info("Added level column to user_progress") + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # серверный perfect_streak. Раньше считался на клиенте и приходил + # в body — можно было подделать. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'user_progress' AND column_name = 'current_streak' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE user_progress + ADD COLUMN current_streak INT DEFAULT 0 + """) + logger.info("Added current_streak column to user_progress") + # ============ sentences ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS sentences ( diff --git a/main.py b/main.py index e831c5e..fa9e001 100644 --- a/main.py +++ b/main.py @@ -51,6 +51,15 @@ else: # ============ Rate Limiting ============ class RateLimiter: + """In-memory rate limiter. + + ⚠️ ВАЖНО: работает корректно только при ОДНОМ воркере uvicorn. + Если запускать с --workers N (N>1), лимиты считаются отдельно в каждом + процессе, и фактический лимит умножается на N. + + 🔧 TODO (23.09.2026): перевести на Redis, когда появится необходимость + масштабирования. Сейчас воркер один — проблема неактуальна. + """ def __init__(self): self.requests = defaultdict(list) self.limits = { diff --git a/routers/game.py b/routers/game.py index 93291bf..a742b78 100644 --- a/routers/game.py +++ b/routers/game.py @@ -143,13 +143,18 @@ async def check_word(request: Request): pool = await get_pool() found_word = None - perfect_count = body.get("perfect_streak", 0) + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # perfect_streak считаем на СЕРВЕРЕ, не берём от клиента. + server_streak = 0 + level_name = "A1" async with pool.acquire() as conn: level = await conn.fetchrow("SELECT * FROM levels WHERE id = $1", level_id) if not level: raise HTTPException(404, "Level not found") + level_name = level["level"] or "A1" + word_paths = level["word_paths"] if isinstance(word_paths, str): word_paths = json.loads(word_paths) @@ -172,23 +177,48 @@ async def check_word(request: Request): found_word = word break - # 🔧 ИСПРАВЛЕНО: вызов достижений ВНЕ блока async with pool.acquire() + # 🔧 Серверный подсчёт streak + current_streak_row = await conn.fetchval( + "SELECT current_streak FROM user_progress WHERE user_id = $1 AND level_id = $2", + telegram_id, level_id + ) + current_streak = current_streak_row or 0 + + if found_word: + server_streak = current_streak + 1 + await conn.execute(""" + INSERT INTO user_progress (user_id, level_id, current_streak, level) + VALUES ($1, $2, $3, $4) + ON CONFLICT (user_id, level_id) DO UPDATE + SET current_streak = $3 + """, telegram_id, level_id, server_streak, level_name) + else: + if current_streak > 0: + await conn.execute(""" + INSERT INTO user_progress (user_id, level_id, current_streak, level) + VALUES ($1, $2, 0, $3) + ON CONFLICT (user_id, level_id) DO UPDATE + SET current_streak = 0 + """, telegram_id, level_id, level_name) + + # 🔧 Вызовы достижений ВНЕ блока if found_word: from routers.achievements import check_and_award_achievements - + new_achievements = [] - if perfect_count > 0: - ach = await check_and_award_achievements(telegram_id, "perfect_words", perfect_count) + if server_streak >= 5: + ach = await check_and_award_achievements(telegram_id, "perfect_words", server_streak) new_achievements.extend(ach) - + return { "status": "ok", "found": True, "word": found_word, + "server_streak": server_streak, "new_achievements": new_achievements } - return {"status": "ok", "found": False} + return {"status": "ok", "found": False, "server_streak": 0} @router.post("/complete-level") @@ -199,7 +229,8 @@ async def complete_level(request: Request): level_id = body.get("level_id") hints_used = body.get("hints_used", 0) completion_time = body.get("completion_time") - perfect_streak = body.get("perfect_streak", 0) + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # perfect_streak больше НЕ берём от клиента. Читаем из user_progress.current_streak. if not level_id: raise HTTPException(400, "level_id required") @@ -219,6 +250,9 @@ async def complete_level(request: Request): score = 0 levels_completed = 0 grand_total = 0 + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # читаем server-side streak из БД ДО сброса в 0. + server_perfect_streak = 0 async with pool.acquire() as conn: user = await conn.fetchrow( @@ -250,11 +284,20 @@ async def complete_level(request: Request): already_completed = True existing_score = existing_progress["score"] else: + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # читаем server-side streak ДО сброса в 0. + server_perfect_streak = await conn.fetchval( + "SELECT current_streak FROM user_progress WHERE user_id = $1 AND level_id = $2", + telegram_id, level_id + ) or 0 + score = max(10, 100 - hints_used * 10) + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # сбрасываем current_streak в 0 при завершении уровня. await conn.execute( - """INSERT INTO user_progress (user_id, level_id, completed_at, hints_used, score, level) - VALUES ($1, $2, NOW(), $3, $4, $5)""", + """INSERT INTO user_progress (user_id, level_id, completed_at, hints_used, score, level, current_streak) + VALUES ($1, $2, NOW(), $3, $4, $5, 0)""", telegram_id, level_id, hints_used, score, level_name, ) @@ -318,8 +361,10 @@ async def complete_level(request: Request): ach = await check_and_award_achievements(telegram_id, "total_score", grand_total) new_achievements.extend(ach) - if perfect_streak >= 5: - ach = await check_and_award_achievements(telegram_id, "perfect_words", perfect_streak) + # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — + # server_perfect_streak прочитан ВНУТРИ блока выше, ДО сброса в 0. + if server_perfect_streak >= 5: + ach = await check_and_award_achievements(telegram_id, "perfect_words", server_perfect_streak) new_achievements.extend(ach) return {