🌊 Волна 10: backend client-controlled + лимиты (5 багов)
- 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 задач
This commit is contained in:
+23
-4
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user