From e9ebaf335103bac4dc51d6102732e35e391023d8 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Thu, 24 Sep 2026 08:58:02 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8A=20=D0=92=D0=BE=D0=BB=D0=BD=D0=B0?= =?UTF-8?q?=2010:=20backend=20client-controlled=20+=20=D0=BB=D0=B8=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=D1=8B=20(5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - client_controlled_hints_game: hints_used из user_progress (game.py + database.py) - client_controlled_hints_bubblewords: current_hints_used из bubble_words_progress (bubblewords.py + database.py) - client_controlled_mistakes_wordquiz: current_mistakes из word_quiz_progress (wordquiz.py + database.py) - sentence_hint_no_limit: таблица sentence_hints_used + лимит 1 раз (sentences.py + database.py) - typing_hint_no_limit: таблица typing_hints_used + лимит 1 раз (typing.py + database.py) Аудит v2: Issue #5, backend 5/10 задач --- database.py | 46 ++++++++++++++++++++++++++++++++++++++++++ routers/bubblewords.py | 22 +++++++++++++------- routers/game.py | 16 ++++++++++++--- routers/sentences.py | 15 ++++++++++++++ routers/typing.py | 19 +++++++++++++++-- routers/wordquiz.py | 27 +++++++++++++++++++++---- 6 files changed, 129 insertions(+), 16 deletions(-) diff --git a/database.py b/database.py index 2b14c7c..de23fc6 100644 --- a/database.py +++ b/database.py @@ -658,6 +658,19 @@ async def init_db(): """) logger.info("Added level column to word_quiz_progress") + # 🔧 ФИКС (24.09.2026): client_controlled_mistakes_wordquiz — + # серверный счётчик mistakes для текущего слова. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'word_quiz_progress' AND column_name = 'current_mistakes' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE word_quiz_progress + ADD COLUMN current_mistakes INT DEFAULT 0 + """) + logger.info("Added current_mistakes column to word_quiz_progress") + # ============ bubble_words_progress ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS bubble_words_progress ( @@ -680,6 +693,19 @@ async def init_db(): """) logger.info("Added level column to bubble_words_progress") + # 🔧 ФИКС (24.09.2026): client_controlled_hints_bubblewords — + # серверный hints_used для текущего уровня пузырей. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'bubble_words_progress' AND column_name = 'current_hints_used' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE bubble_words_progress + ADD COLUMN current_hints_used INT DEFAULT 0 + """) + logger.info("Added current_hints_used column to bubble_words_progress") + # ============ wrong_because_explanations ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS wrong_because_explanations ( @@ -857,6 +883,26 @@ async def init_db(): await conn.execute("CREATE INDEX IF NOT EXISTS idx_archive_user_date ON user_learning_answers_archive(user_id, created_at)") await conn.execute("CREATE INDEX IF NOT EXISTS idx_archive_skill_tag ON user_learning_answers_archive(skill_tag)") + # 🔧 ФИКС (24.09.2026): sentence_hint_no_limit + typing_hint_no_limit — + # таблицы для лимита подсказок (1 раз на предложение). + await conn.execute(""" + CREATE TABLE IF NOT EXISTS sentence_hints_used ( + user_id BIGINT REFERENCES users(telegram_id) ON DELETE CASCADE, + sentence_id INTEGER REFERENCES sentences(id) ON DELETE CASCADE, + used_at TIMESTAMP DEFAULT NOW(), + PRIMARY KEY (user_id, sentence_id) + ) + """) + + await conn.execute(""" + CREATE TABLE IF NOT EXISTS typing_hints_used ( + user_id BIGINT REFERENCES users(telegram_id) ON DELETE CASCADE, + sentence_id INTEGER REFERENCES sentences(id) ON DELETE CASCADE, + used_at TIMESTAMP DEFAULT NOW(), + PRIMARY KEY (user_id, sentence_id) + ) + """) + # ============ Индексы ============ await conn.execute("CREATE INDEX IF NOT EXISTS idx_levels_number ON levels(level_number)") await conn.execute("CREATE INDEX IF NOT EXISTS idx_levels_level ON levels(level)") diff --git a/routers/bubblewords.py b/routers/bubblewords.py index b4986f4..baaa287 100644 --- a/routers/bubblewords.py +++ b/routers/bubblewords.py @@ -176,12 +176,10 @@ async def complete_bubble_level(request: Request): """Завершение уровня пузырей, начисление очков и проверка достижений""" telegram_id, _ = await require_auth(request) body = await request.json() - hints_used = body.get("hints_used", 0) words_count = body.get("words_count", 3) completion_time = body.get("completion_time") - - hints_used = min(max(0, hints_used), 3) - score = max(10, 100 - hints_used * 10) + # 🔧 ФИКС (24.09.2026): client_controlled_hints_bubblewords — + # hints_used больше НЕ берём от клиента. Читаем из bubble_words_progress.current_hints_used. pool = await get_pool() async with pool.acquire() as conn: @@ -196,13 +194,23 @@ async def complete_bubble_level(request: Request): "SELECT current_level FROM users WHERE telegram_id = $1", telegram_id ) or "A1" + # 🔧 ФИКС (24.09.2026): client_controlled_hints_bubblewords — + # читаем серверный hints_used. + hints_used = await conn.fetchval( + "SELECT current_hints_used FROM bubble_words_progress WHERE user_id = $1", + telegram_id + ) or 0 + hints_used = min(max(0, hints_used), 3) + score = max(10, 100 - hints_used * 10) + await conn.execute(""" - INSERT INTO bubble_words_progress (user_id, levels_completed, total_score, level) - VALUES ($1, 1, $2, $3) + INSERT INTO bubble_words_progress (user_id, levels_completed, total_score, level, current_hints_used) + VALUES ($1, 1, $2, $3, 0) ON CONFLICT (user_id) DO UPDATE SET levels_completed = bubble_words_progress.levels_completed + 1, total_score = bubble_words_progress.total_score + $2, - level = $3 + level = $3, + current_hints_used = 0 """, telegram_id, score, current_level) # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_bubblewords — diff --git a/routers/game.py b/routers/game.py index a742b78..b59d551 100644 --- a/routers/game.py +++ b/routers/game.py @@ -227,16 +227,15 @@ async def complete_level(request: Request): telegram_id, _ = await require_auth(request) body = await request.json() level_id = body.get("level_id") - hints_used = body.get("hints_used", 0) completion_time = body.get("completion_time") # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — # perfect_streak больше НЕ берём от клиента. Читаем из user_progress.current_streak. + # 🔧 ФИКС (24.09.2026): client_controlled_hints_game — + # hints_used больше НЕ берём от клиента. Читаем из user_progress.hints_used. if not level_id: raise HTTPException(400, "level_id required") - hints_used = min(max(0, hints_used), 3) - # Защита от читерства: минимальное время 5 секунд if completion_time is not None and completion_time < 5: raise HTTPException(400, "Completion time too fast. Minimum 5 seconds required.") @@ -253,6 +252,9 @@ async def complete_level(request: Request): # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — # читаем server-side streak из БД ДО сброса в 0. server_perfect_streak = 0 + # 🔧 ФИКС (24.09.2026): client_controlled_hints_game — + # hints_used читаем из БД, не доверяем клиенту. + hints_used = 0 async with pool.acquire() as conn: user = await conn.fetchrow( @@ -291,6 +293,14 @@ async def complete_level(request: Request): telegram_id, level_id ) or 0 + # 🔧 ФИКС (24.09.2026): client_controlled_hints_game — + # читаем hints_used из БД, не доверяем клиенту. + hints_used = await conn.fetchval( + "SELECT hints_used FROM user_progress WHERE user_id = $1 AND level_id = $2", + telegram_id, level_id + ) or 0 + hints_used = min(max(0, hints_used), 3) + score = max(10, 100 - hints_used * 10) # 🔧 ФИКС (23.09.2026): client_controlled_achievement_values — diff --git a/routers/sentences.py b/routers/sentences.py index e09c577..9539351 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -20,6 +20,21 @@ async def get_sentence_hint(sentence_id: int, request: Request): if not row: raise HTTPException(404, "Sentence not found") + # 🔧 ФИКС (24.09.2026): sentence_hint_no_limit — лимит 1 раз на предложение. + already_used = await conn.fetchval( + "SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2", + telegram_id, sentence_id + ) + if already_used: + raise HTTPException(403, "Hint already used for this sentence") + + # Записываем использование + await conn.execute(""" + INSERT INTO sentence_hints_used (user_id, sentence_id) + VALUES ($1, $2) + ON CONFLICT (user_id, sentence_id) DO NOTHING + """, telegram_id, sentence_id) + return { "sentence_pl": row["sentence_pl"], } diff --git a/routers/typing.py b/routers/typing.py index 22fc8b2..794ea20 100644 --- a/routers/typing.py +++ b/routers/typing.py @@ -98,8 +98,8 @@ async def check_typing_sentence(request: Request): @router.get("/hint/{sentence_id}") async def get_typing_hint(request: Request, sentence_id: int): - """Возвращает правильный ответ для подсказки.""" - await require_auth(request) + """Возвращает правильный ответ для подсказки (лимит 1 раз).""" + telegram_id, _ = await require_auth(request) pool = await get_pool() async with pool.acquire() as conn: @@ -108,6 +108,21 @@ async def get_typing_hint(request: Request, sentence_id: int): """, sentence_id) if not row: raise HTTPException(404, "Sentence not found") + + # 🔧 ФИКС (24.09.2026): typing_hint_no_limit — лимит 1 раз на предложение. + already_used = await conn.fetchval( + "SELECT 1 FROM typing_hints_used WHERE user_id = $1 AND sentence_id = $2", + telegram_id, sentence_id + ) + if already_used: + raise HTTPException(403, "Hint already used for this sentence") + + # Записываем использование + await conn.execute(""" + INSERT INTO typing_hints_used (user_id, sentence_id) + VALUES ($1, $2) + ON CONFLICT (user_id, sentence_id) DO NOTHING + """, telegram_id, sentence_id) return {"correct_answer": row["sentence_pl"]} diff --git a/routers/wordquiz.py b/routers/wordquiz.py index ca681ec..7f405ae 100644 --- a/routers/wordquiz.py +++ b/routers/wordquiz.py @@ -138,8 +138,9 @@ async def check_quiz_answer(request: Request): body = await request.json() correct_polish = body.get("correct_polish", "") user_answer = body.get("answer", "") - mistakes = body.get("mistakes", 0) completion_time = body.get("completion_time") + # 🔧 ФИКС (24.09.2026): client_controlled_mistakes_wordquiz — + # mistakes больше НЕ берём от клиента. Считаем на сервере. if not correct_polish or not user_answer: raise HTTPException(400, "correct_polish and answer required") @@ -160,14 +161,32 @@ async def check_quiz_answer(request: Request): "SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1", telegram_id ) or 0 + # 🔧 ФИКС (24.09.2026): client_controlled_mistakes_wordquiz — + # читаем серверный current_mistakes. + mistakes = await conn.fetchval( + "SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1", + telegram_id + ) or 0 if is_correct: current_streak += 1 else: current_streak = 0 + # 🔧 Инкрементим mistakes на сервере + await conn.execute(""" + INSERT INTO word_quiz_progress (user_id, current_mistakes) + VALUES ($1, 1) + ON CONFLICT (user_id) DO UPDATE + SET current_mistakes = word_quiz_progress.current_mistakes + 1 + """, telegram_id) + mistakes += 1 if is_correct: score = max(10, 50 - (mistakes * 20)) + # 🔧 Сбрасываем mistakes при правильном ответе + await conn.execute(""" + UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1 + """, telegram_id) await conn.execute(""" INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak) @@ -216,12 +235,12 @@ async def check_quiz_answer(request: Request): # При 3 ошибках — начисляем утешительные 10 очков if mistakes >= 3: await conn.execute(""" - INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak) - VALUES ($1, 0, 10, 0) + INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, current_mistakes) + VALUES ($1, 0, 10, 0, $2) ON CONFLICT (user_id) DO UPDATE SET total_score = word_quiz_progress.total_score + 10, correct_streak = 0 - """, telegram_id) + """, telegram_id, mistakes) else: await conn.execute(""" INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak)