From 10242f89b35267e0859421d7accc0c5d86499969 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:37:29 +0000 Subject: [PATCH 01/15] =?UTF-8?q?[Eva]=20B1:=20=D0=BC=D0=B8=D0=B3=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20sentence=5Fprogress=20(list=5Fopened?= =?UTF-8?q?,=20no=5Fmistakes=5Fstreak,=20perfect=5Fstreak,=20completion=5F?= =?UTF-8?q?time)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/database.py b/database.py index 3b173d0..a84e419 100644 --- a/database.py +++ b/database.py @@ -300,6 +300,60 @@ async def init_db(): """) logger.info("Added level column to sentence_progress") + # 🔧 НОВОЕ (16.10.2026): list_opened — счётчик «показать предложение» + # для текущего предложения. Medium — лимит 2, Easy — ∞, Hard — 0. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_progress' AND column_name = 'list_opened' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_progress + ADD COLUMN list_opened INTEGER DEFAULT 0 + """) + logger.info("Added list_opened column to sentence_progress") + + # 🔧 НОВОЕ (16.10.2026): no_mistakes_streak — серия предложений без ошибок. + # +1 если предложение собрано без ошибок, иначе сброс в 0. + # Нужен для достижения sentence_no_mistakes. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_progress' AND column_name = 'no_mistakes_streak' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_progress + ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0 + """) + logger.info("Added no_mistakes_streak column to sentence_progress") + + # 🔧 НОВОЕ (16.10.2026): perfect_streak — серия идеальных предложений + # (без ошибок + без показов). +1 если всё чисто, иначе сброс в 0. + # Нужен для достижения sentence_perfect_streak. + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_progress' AND column_name = 'perfect_streak' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_progress + ADD COLUMN perfect_streak INTEGER DEFAULT 0 + """) + logger.info("Added perfect_streak column to sentence_progress") + + # 🔧 НОВОЕ (16.10.2026): completion_time — время прохождения последнего + # предложения (сек). Для статистики и бонуса Hard (≤15 сек). + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_progress' AND column_name = 'completion_time' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_progress + ADD COLUMN completion_time INTEGER DEFAULT 0 + """) + logger.info("Added completion_time column to sentence_progress") + # ============ typing_progress ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS typing_progress ( From 5be242aafd24557990c9afde3a914b8de2683641 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:46:30 +0000 Subject: [PATCH 02/15] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86?= =?UTF-8?q?=D0=B0=20sentence=5Fstats=20+=20=D0=B8=D0=B4=D0=B5=D0=BC=D0=BF?= =?UTF-8?q?=D0=BE=D1=82=D0=B5=D0=BD=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BC=D0=B8?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/database.py b/database.py index a84e419..c62b308 100644 --- a/database.py +++ b/database.py @@ -1047,6 +1047,70 @@ async def init_db(): """) logger.info("Added perfect_streak column to bubble_words_progress") + # ============ sentence_stats ============ + # 🔧 НОВОЕ (16.10.2026): глобальная статистика игры «Составь предложение». + # PK = user_id (одна строка на юзера), по образцу word_quiz_progress. + # total_score — суммарные очки; no_mistakes_streak / perfect_streak — + # серии для достижений sentence_no_mistakes / sentence_perfect_streak. + await conn.execute(""" + CREATE TABLE IF NOT EXISTS sentence_stats ( + user_id BIGINT PRIMARY KEY + REFERENCES users(telegram_id) ON DELETE CASCADE, + total_score INTEGER DEFAULT 0, + no_mistakes_streak INTEGER DEFAULT 0, + perfect_streak INTEGER DEFAULT 0, + updated_at TIMESTAMP DEFAULT NOW() + ) + """) + + # ============ Авто-миграция: total_score ============ + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_stats' AND column_name = 'total_score' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_stats + ADD COLUMN total_score INTEGER DEFAULT 0 + """) + logger.info("Added total_score column to sentence_stats") + + # ============ Авто-миграция: no_mistakes_streak ============ + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_stats' AND column_name = 'no_mistakes_streak' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_stats + ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0 + """) + logger.info("Added no_mistakes_streak column to sentence_stats") + + # ============ Авто-миграция: perfect_streak ============ + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_stats' AND column_name = 'perfect_streak' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_stats + ADD COLUMN perfect_streak INTEGER DEFAULT 0 + """) + logger.info("Added perfect_streak column to sentence_stats") + + # ============ Авто-миграция: updated_at ============ + col_exists = await conn.fetchval(""" + SELECT 1 FROM information_schema.columns + WHERE table_name = 'sentence_stats' AND column_name = 'updated_at' + """) + if not col_exists: + await conn.execute(""" + ALTER TABLE sentence_stats + ADD COLUMN updated_at TIMESTAMP DEFAULT NOW() + """) + logger.info("Added updated_at column to sentence_stats") + # ============ wrong_because_explanations ============ await conn.execute(""" CREATE TABLE IF NOT EXISTS wrong_because_explanations ( From 4e78c32c18d6535ee6cc23b1ec5435d1848bddf7 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:48:17 +0000 Subject: [PATCH 03/15] =?UTF-8?q?[Eva]=20B2.1:=20/next=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=B5=D1=82=20=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=B7=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D1=91?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/sentences.py b/routers/sentences.py index 1a29a3a..27d1666 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -113,7 +113,7 @@ async def get_next_sentence(request: Request): SELECT s.* FROM sentences s WHERE s.level = $1 AND s.id NOT IN ( - SELECT sentence_id FROM sentence_progress WHERE user_id = $2 + SELECT sentence_id FROM sentence_progress WHERE user_id = $2 AND completed_at IS NOT NULL ) ORDER BY RANDOM() LIMIT 1 From 3548654d6a0ed7730e1477d3d8aafb4e64f96df4 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:48:26 +0000 Subject: [PATCH 04/15] =?UTF-8?q?[Eva]=20B2.1:=20/next=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B7=D0=B4=D0=B0=D1=91=D1=82=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=83=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81=D0=B0?= =?UTF-8?q?=20(in-progress)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/routers/sentences.py b/routers/sentences.py index 27d1666..5a5f248 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -122,6 +122,13 @@ async def get_next_sentence(request: Request): if not row: return {"completed": True, "message": "All sentences completed!"} + # 🔧 НОВОЕ (16.10.2026): строка прогресса (in-progress) для счётчика list_opened. + await conn.execute(""" + INSERT INTO sentence_progress (user_id, sentence_id, list_opened, completion_time) + VALUES ($1, $2, 0, 0) + ON CONFLICT (user_id, sentence_id) DO NOTHING + """, telegram_id, row["id"]) + # Оригинальные слова (для проверки) correct_words = row["sentence_pl"].split() From 5b2dbc0d4201f6b5e343ff61d2f5b300cbf85275 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:48:37 +0000 Subject: [PATCH 05/15] =?UTF-8?q?[Eva]=20B2.2:=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=8D=D0=BD=D0=B4=D0=BF=D0=BE=D0=B8=D0=BD=D1=82=20POS?= =?UTF-8?q?T=20/sentences/show-answer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/routers/sentences.py b/routers/sentences.py index 5a5f248..8af1b4f 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -151,6 +151,59 @@ async def get_next_sentence(request: Request): } +@router.post("/show-answer") +async def show_answer(request: Request): + """Подсказка «показать предложение». Easy — ∞ бесплатно, Medium — 2 раза × −20, Hard — 403.""" + telegram_id, _ = await require_auth(request) + body = await request.json() + sentence_id = body.get("sentence_id") + if not sentence_id: + raise HTTPException(400, "sentence_id required") + + pool = await get_pool() + async with pool.acquire() as conn: + user = await conn.fetchrow( + "SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id + ) + if not user: + raise HTTPException(401, "User not registered") + difficulty = user["difficulty"] or "medium" + + row = await conn.fetchrow( + "SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id + ) + if not row: + raise HTTPException(404, "Sentence not found") + + if difficulty == "hard": + raise HTTPException(403, "Hints are disabled on Hard difficulty") + + progress = await conn.fetchrow( + "SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2", + telegram_id, sentence_id + ) + list_opened = (progress["list_opened"] if progress else 0) or 0 + + if difficulty == "medium": + if list_opened >= 2: + raise HTTPException(403, "Show answer limit reached on Medium difficulty") + await conn.execute(""" + INSERT INTO sentence_progress (user_id, sentence_id, list_opened) + VALUES ($1, $2, 1) + ON CONFLICT (user_id, sentence_id) DO UPDATE + SET list_opened = sentence_progress.list_opened + 1 + """, telegram_id, sentence_id) + new_list_opened = list_opened + 1 + else: + new_list_opened = list_opened # Easy — не инкрементим + + return { + "sentence_pl": row["sentence_pl"], + "list_opened": new_list_opened, + "max_list_opened": None if difficulty == "easy" else 2, + } + + @router.post("/check") async def check_sentence(request: Request): """Проверка предложения с защитой от повторного прохождения и выдачей достижений""" From 82eb9208d82a48e467090bd2ce44014bf8306ebe Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:48:50 +0000 Subject: [PATCH 06/15] =?UTF-8?q?[Eva]=20B2.3:=20already=5Fcompleted=20?= =?UTF-8?q?=D0=BF=D0=BE=20completed=5Fat=20IS=20NOT=20NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/sentences.py b/routers/sentences.py index 8af1b4f..83f3ce4 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -236,7 +236,7 @@ async def check_sentence(request: Request): raise HTTPException(404, "Sentence not found") existing_progress = await conn.fetchrow( - "SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2", + "SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2 AND completed_at IS NOT NULL", telegram_id, sentence_id ) From da3f1567a8178684f997bb1f6fa3afd11c930fcd Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:49:00 +0000 Subject: [PATCH 07/15] =?UTF-8?q?[Eva]=20B2.3:=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=20=D0=BE=D1=87=D0=BA=D0=BE=D0=B2=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=20+=20=D1=81=D0=B5=D1=80=D0=B8=D0=B8=20=D0=B2=20sentence=5Fsta?= =?UTF-8?q?ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 60 ++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/routers/sentences.py b/routers/sentences.py index 83f3ce4..43a4241 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -268,36 +268,58 @@ async def check_sentence(request: Request): is_correct = user_words_normalized == correct_words_normalized if is_correct: - word_count = len(correct_words_original) - - # 🆕 Расчёт звёзд для "Составь предложение" - # Старт 5. Штрафы: - # -1 за каждую неверную проверку (клиент шлёт wrong_checks) - # -1 если time > лимита (по длине: 3-4 → 30с, 5-6 → 45с, 7-8 → 60с) + # 🔧 НОВОЕ (16.10.2026): очки по формуле сложностей. + # Easy — фикс 20. Medium — 60 − 20×list_opened (мин 20). + # Hard — 100, +50 бонус если completion_time <= 15 сек. wrong_checks = int(body.get("wrong_checks", 0) or 0) - if word_count <= 4: - time_limit = 30 - elif word_count <= 6: - time_limit = 45 - else: - time_limit = 60 + user_row = await conn.fetchrow( + "SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id + ) + difficulty = (user_row["difficulty"] if user_row else None) or "medium" - time_penalty = 1 if (completion_time and completion_time > time_limit) else 0 - wrong_penalty = min(max(0, wrong_checks), 3) - stars = max(1, 5 - wrong_penalty - time_penalty) + progress_row = await conn.fetchrow( + "SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2", + telegram_id, sentence_id + ) + list_opened = (progress_row["list_opened"] if progress_row else 0) or 0 + + if difficulty == "easy": + points = 20 + elif difficulty == "medium": + points = max(20, 60 - 20 * list_opened) + else: # hard + points = 100 + if completion_time is not None and completion_time <= 15: + points = 150 # Начисляем XP from services.xp import award_xp - xp_result = await award_xp(conn, telegram_id, "sentence", stars) + xp_result = await award_xp(conn, telegram_id, "sentence", points) score = xp_result["points"] await conn.execute( - """INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level) - VALUES ($1, $2, NOW(), $3, $4)""", - telegram_id, sentence_id, score, row["level"], + """INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level, completion_time) + VALUES ($1, $2, NOW(), $3, $4, $5) + ON CONFLICT (user_id, sentence_id) DO UPDATE + SET completed_at = NOW(), score = $3, level = $4, completion_time = $5""", + telegram_id, sentence_id, score, row["level"], completion_time or 0, ) + # 🔧 НОВОЕ (16.10.2026): серии в sentence_stats (PK user_id). + await conn.execute(""" + INSERT INTO sentence_stats (user_id, total_score, no_mistakes_streak, perfect_streak, updated_at) + VALUES ($1, $2, + CASE WHEN $3 = 0 THEN 1 ELSE 0 END, + CASE WHEN $3 = 0 AND $4 = 0 THEN 1 ELSE 0 END, + NOW()) + ON CONFLICT (user_id) DO UPDATE + SET total_score = sentence_stats.total_score + $2, + no_mistakes_streak = CASE WHEN $3 = 0 THEN sentence_stats.no_mistakes_streak + 1 ELSE 0 END, + perfect_streak = CASE WHEN $3 = 0 AND $4 = 0 THEN sentence_stats.perfect_streak + 1 ELSE 0 END, + updated_at = NOW() + """, telegram_id, score, wrong_checks, list_opened) + # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences — # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(), # что могло привести к дедлоку пула. Теперь собираем данные внутри блока, From 7cbde183ff22e7cf6c2c47ee88a0263adc2759d9 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:49:07 +0000 Subject: [PATCH 08/15] =?UTF-8?q?[Eva]=20B2.3:=20=D1=83=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20stars=20=D0=B8=D0=B7=20=D0=BE=D1=82=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=B0=20(KeyError)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/sentences.py b/routers/sentences.py index 43a4241..227259e 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -369,7 +369,6 @@ async def check_sentence(request: Request): "score": score, "new_achievements": new_achievements, # 🆕 XP - "stars": xp_result["stars"], "base_points": xp_result["base_points"], "multiplier": xp_result["multiplier"], "points": xp_result["points"], From 61fbbe55e8c7996fac8883613d1ec615c1409728 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:56:45 +0000 Subject: [PATCH 09/15] =?UTF-8?q?[Eva]=20=D0=A7=D0=B8=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=20sentence=5Fstats=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/routers/sentences.py b/routers/sentences.py index 227259e..4bf0e13 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -320,6 +320,15 @@ async def check_sentence(request: Request): updated_at = NOW() """, telegram_id, score, wrong_checks, list_opened) + # 🔧 НОВОЕ (16.10.2026): читаем серии/очки для достижений. + stats_row = await conn.fetchrow( + "SELECT total_score, no_mistakes_streak, perfect_streak FROM sentence_stats WHERE user_id = $1", + telegram_id + ) + sentence_total_score = stats_row["total_score"] if stats_row else 0 + sentence_no_mistakes = stats_row["no_mistakes_streak"] if stats_row else 0 + sentence_perfect_streak = stats_row["perfect_streak"] if stats_row else 0 + # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences — # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(), # что могло привести к дедлоку пула. Теперь собираем данные внутри блока, From 3dfe34f18ab90a020a2ae632b590bbc44aaa2454 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:56:48 +0000 Subject: [PATCH 10/15] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D0=BC=203=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85?= =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20/check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/sentences.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routers/sentences.py b/routers/sentences.py index 4bf0e13..0ad38b0 100644 --- a/routers/sentences.py +++ b/routers/sentences.py @@ -359,6 +359,9 @@ async def check_sentence(request: Request): achievements_to_check = [ ("sentences_completed", sentences_completed), ("total_score", grand_total), + ("sentence_no_mistakes", sentence_no_mistakes), + ("sentence_perfect_streak", sentence_perfect_streak), + ("sentence_xp", sentence_total_score), ] if completion_time is not None and completion_time > 0: achievements_to_check.append(("speed_sentence", int(completion_time))) From c7ca0c97c28d298fa3853c79060e73caddf6a0f7 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:57:09 +0000 Subject: [PATCH 11/15] =?UTF-8?q?[Eva]=20Sentence=20Builder:=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA=2010=20?= =?UTF-8?q?=E2=86=92=2020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/achievements.py b/routers/achievements.py index c7da43e..41c6f6d 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -112,7 +112,7 @@ ACHIEVEMENTS_DATA = [ "desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches", "type": "wordsearch_xp", "value": 10000}, - # ===== Sentence Builder (10) ===== + # ===== Sentence Builder (20) ===== {"code": "first_sentence", "category": "sentence", "icon": "📝", "name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant", "desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence", From 2d687904b0db120900f5449d9c0f9488d41899e8 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:57:12 +0000 Subject: [PATCH 12/15] =?UTF-8?q?[Eva]=20=D0=A3=D0=B4=D0=B0=D0=BB=D1=8F?= =?UTF-8?q?=D1=8E=203=20=D0=BC=D1=91=D1=80=D1=82=D0=B2=D1=8B=D1=85=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/routers/achievements.py b/routers/achievements.py index 41c6f6d..1071a49 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -138,20 +138,6 @@ ACHIEVEMENTS_DATA = [ "desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences", "type": "sentences_completed", "value": 200}, - {"code": "perfect_sentence_5", "category": "sentence", "icon": "✨", - "name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist", - "desc_pl": "Ułóż 5 zdań bez błędu", "desc_ru": "Составить 5 предложений без единой ошибки", "desc_uk": "Скласти 5 речень без жодної помилки", "desc_en": "Build 5 sentences without mistakes", - "type": "perfect_sentences", "value": 5}, - - {"code": "sentence_perfect_10", "category": "sentence", "icon": "💎", - "name_pl": "Mistrz zdań", "name_ru": "Мастер предложений", "name_uk": "Майстер речень", "name_en": "Sentence Master", - "desc_pl": "Ułóż 10 zdań bez błędu", "desc_ru": "Составить 10 предложений без ошибок", "desc_uk": "Скласти 10 речень без помилок", "desc_en": "Build 10 sentences without mistakes", - "type": "perfect_sentences", "value": 10}, - - {"code": "sentence_streak_10", "category": "sentence", "icon": "💪", - "name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless", - "desc_pl": "Ułóż 10 zdań z rzędu bez błędu", "desc_ru": "Составить 10 предложений подряд без ошибок", "desc_uk": "Скласти 10 речень поспіль без помилок", "desc_en": "Build 10 sentences in a row without mistakes", - "type": "sentence_streak", "value": 10}, {"code": "speed_10", "category": "sentence", "icon": "🚀", "name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo", From ed60a54e0c10ebf60e70e6d95f01ea41daa53a9e Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:57:42 +0000 Subject: [PATCH 13/15] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D1=8E=20sentence=5F500=20=D0=B8=20sentence=5F1000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/routers/achievements.py b/routers/achievements.py index 1071a49..3856e2b 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -138,6 +138,16 @@ ACHIEVEMENTS_DATA = [ "desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences", "type": "sentences_completed", "value": 200}, + {"code": "sentence_500", "category": "sentence", "icon": "🌟", + "name_pl": "Legenda zdań", "name_ru": "Легенда предложений", "name_uk": "Легенда речень", "name_en": "Sentence Legend", + "desc_pl": "Ułóż 500 zdań", "desc_ru": "Составить 500 предложений", "desc_uk": "Скласти 500 речень", "desc_en": "Build 500 sentences", + "type": "sentences_completed", "value": 500}, + + {"code": "sentence_1000", "category": "sentence", "icon": "👑", + "name_pl": "Guru zdań", "name_ru": "Гуру предложений", "name_uk": "Гуру речень", "name_en": "Sentence Guru", + "desc_pl": "Ułóż 1000 zdań", "desc_ru": "Составить 1000 предложений", "desc_uk": "Скласти 1000 речень", "desc_en": "Build 1000 sentences", + "type": "sentences_completed", "value": 1000}, + {"code": "speed_10", "category": "sentence", "icon": "🚀", "name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo", From 11ef94a9bff7e721029b733b1a31aa340c8be024 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:57:53 +0000 Subject: [PATCH 14/15] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D1=8E=20sentence=5Fspeed=5F3=20=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B8=D0=B8=20=D0=B1=D0=B5=D0=B7=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/routers/achievements.py b/routers/achievements.py index 3856e2b..e6f4c44 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -158,6 +158,31 @@ ACHIEVEMENTS_DATA = [ "name_pl": "Ekspres", "name_ru": "Экспресс", "name_uk": "Експрес", "name_en": "Express", "desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds", "type": "speed_sentence", "value": 5}, + + {"code": "sentence_speed_3", "category": "sentence", "icon": "⚡", + "name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning", + "desc_pl": "Ułóż zdanie w mniej niż 3 sekundy", "desc_ru": "Составить предложение быстрее 3 секунд", "desc_uk": "Скласти речення швидше 3 секунд", "desc_en": "Build a sentence in under 3 seconds", + "type": "speed_sentence", "value": 3}, + + {"code": "sentence_no_mistakes_5", "category": "sentence", "icon": "✨", + "name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless", + "desc_pl": "Ułóż 5 zdań bez błędu z rzędu", "desc_ru": "Составить 5 предложений без ошибок подряд", "desc_uk": "Скласти 5 речень без помилок поспіль", "desc_en": "Build 5 sentences without mistakes in a row", + "type": "sentence_no_mistakes", "value": 5}, + + {"code": "sentence_no_mistakes_10", "category": "sentence", "icon": "💎", + "name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Infallible", + "desc_pl": "Ułóż 10 zdań bez błędu z rzędu", "desc_ru": "Составить 10 предложений без ошибок подряд", "desc_uk": "Скласти 10 речень без помилок поспіль", "desc_en": "Build 10 sentences without mistakes in a row", + "type": "sentence_no_mistakes", "value": 10}, + + {"code": "sentence_no_mistakes_25", "category": "sentence", "icon": "🏆", + "name_pl": "Mistrz czystości", "name_ru": "Мастер чистоты", "name_uk": "Майстер чистоти", "name_en": "Pure Master", + "desc_pl": "Ułóż 25 zdań bez błędu z rzędu", "desc_ru": "Составить 25 предложений без ошибок подряд", "desc_uk": "Скласти 25 речень без помилок поспіль", "desc_en": "Build 25 sentences without mistakes in a row", + "type": "sentence_no_mistakes", "value": 25}, + + {"code": "sentence_no_mistakes_50", "category": "sentence", "icon": "👑", + "name_pl": "Król czystości", "name_ru": "Король чистоты", "name_uk": "Король чистоти", "name_en": "Pure King", + "desc_pl": "Ułóż 50 zdań bez błędu z rzędu", "desc_ru": "Составить 50 предложений без ошибок подряд", "desc_uk": "Скласти 50 речень без помилок поспіль", "desc_en": "Build 50 sentences without mistakes in a row", + "type": "sentence_no_mistakes", "value": 50}, # ===== Word Quiz (20) ===== {"code": "quiz_10", "category": "wordquiz", "icon": "🧠", From 400cf375bedfdedd1167f9b2808d87c11d0daf96 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Fri, 16 Oct 2026 10:58:06 +0000 Subject: [PATCH 15/15] =?UTF-8?q?[Eva]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D1=8E=20=D0=B8=D0=B4=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=81=D0=B5=D1=80=D0=B8=D0=B8=20=D0=B8=20XP-?= =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/routers/achievements.py b/routers/achievements.py index e6f4c44..4f3afc2 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -183,6 +183,36 @@ ACHIEVEMENTS_DATA = [ "name_pl": "Król czystości", "name_ru": "Король чистоты", "name_uk": "Король чистоти", "name_en": "Pure King", "desc_pl": "Ułóż 50 zdań bez błędu z rzędu", "desc_ru": "Составить 50 предложений без ошибок подряд", "desc_uk": "Скласти 50 речень без помилок поспіль", "desc_en": "Build 50 sentences without mistakes in a row", "type": "sentence_no_mistakes", "value": 50}, + + {"code": "sentence_perfect_streak_5", "category": "sentence", "icon": "✨", + "name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak", + "desc_pl": "Ułóż 5 idealnych zdań z rzędu", "desc_ru": "Составить 5 идеальных предложений подряд", "desc_uk": "Скласти 5 ідеальних речень поспіль", "desc_en": "Build 5 perfect sentences in a row", + "type": "sentence_perfect_streak", "value": 5}, + + {"code": "sentence_perfect_streak_10", "category": "sentence", "icon": "💎", + "name_pl": "Mistrz perfekcji", "name_ru": "Мастер идеала", "name_uk": "Майстер ідеалу", "name_en": "Perfection Master", + "desc_pl": "Ułóż 10 idealnych zdań z rzędu", "desc_ru": "Составить 10 идеальных предложений подряд", "desc_uk": "Скласти 10 ідеальних речень поспіль", "desc_en": "Build 10 perfect sentences in a row", + "type": "sentence_perfect_streak", "value": 10}, + + {"code": "sentence_perfect_streak_25", "category": "sentence", "icon": "🏆", + "name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist", + "desc_pl": "Ułóż 25 idealnych zdań z rzędu", "desc_ru": "Составить 25 идеальных предложений подряд", "desc_uk": "Скласти 25 ідеальних речень поспіль", "desc_en": "Build 25 perfect sentences in a row", + "type": "sentence_perfect_streak", "value": 25}, + + {"code": "sentence_perfect_streak_50", "category": "sentence", "icon": "👑", + "name_pl": "Idealny król", "name_ru": "Идеальный король", "name_uk": "Ідеальний король", "name_en": "Perfect King", + "desc_pl": "Ułóż 50 idealnych zdań z rzędu", "desc_ru": "Составить 50 идеальных предложений подряд", "desc_uk": "Скласти 50 ідеальних речень поспіль", "desc_en": "Build 50 perfect sentences in a row", + "type": "sentence_perfect_streak", "value": 50}, + + {"code": "sentence_xp_1000", "category": "sentence", "icon": "💎", + "name_pl": "Zdaniowy XP", "name_ru": "XP предложений", "name_uk": "XP речень", "name_en": "Sentence XP", + "desc_pl": "Zdobądź 1000 punktów w zdaniach", "desc_ru": "Набрать 1000 очков в предложениях", "desc_uk": "Набрати 1000 балів у реченнях", "desc_en": "Earn 1000 points in sentences", + "type": "sentence_xp", "value": 1000}, + + {"code": "sentence_xp_5000", "category": "sentence", "icon": "👑", + "name_pl": "Zdaniowy diament", "name_ru": "Бриллиант предложений", "name_uk": "Діамант речень", "name_en": "Sentence Diamond", + "desc_pl": "Zdobądź 5000 punktów w zdaniach", "desc_ru": "Набрать 5000 очков в предложениях", "desc_uk": "Набрати 5000 балів у реченнях", "desc_en": "Earn 5000 points in sentences", + "type": "sentence_xp", "value": 5000}, # ===== Word Quiz (20) ===== {"code": "quiz_10", "category": "wordquiz", "icon": "🧠",