From eb26ba9a25a71ccafa42954414e530447b34dfe3 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Mon, 2 Nov 2026 09:47:39 +0000 Subject: [PATCH] =?UTF-8?q?[Eva]=20=D0=9F=D0=BE=D0=B2=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=81=D0=B2=D0=B0=D0=B9=D0=BF=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B0=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BD=D0=B0=D0=BA=D1=80=D1=83=D1=87=D0=B8?= =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D1=82=20=D1=81=D0=B5=D1=80=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/routers/game.py b/routers/game.py index 691b71a..fdb2f2e 100644 --- a/routers/game.py +++ b/routers/game.py @@ -275,14 +275,33 @@ async def check_word(request: Request): ) current_streak = current_streak_row or 0 + # 🔧 НОВОЕ (02.11.2026): found_words — какие слова уже найдены. + # Повторный свайп уже найденного слова не должен накручивать серию. + found_words_row = await conn.fetchval( + "SELECT found_words FROM user_progress WHERE user_id = $1 AND level_id = $2", + telegram_id, level_id + ) + found_words = list(found_words_row or []) + if found_word: + if found_word in found_words: + # Слово уже найдено — не накручиваем серию. + return { + "status": "ok", + "found": True, + "word": found_word, + "server_streak": current_streak, + "already_found": True, + "new_achievements": [] + } server_streak = current_streak + 1 + found_words.append(found_word) await conn.execute(""" - INSERT INTO user_progress (user_id, level_id, current_streak, level) - VALUES ($1, $2, $3, $4) + INSERT INTO user_progress (user_id, level_id, current_streak, level, found_words) + VALUES ($1, $2, $3, $4, $5) ON CONFLICT (user_id, level_id) DO UPDATE - SET current_streak = $3 - """, telegram_id, level_id, server_streak, level_name) + SET current_streak = $3, found_words = $5 + """, telegram_id, level_id, server_streak, level_name, found_words) else: if current_streak > 0: await conn.execute("""