Author SHA1 Message Date
Drobysh ce9f68ae51 Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#50) from eva/chat-ec3e05-backend into main
Reviewed-on: #50
2026-10-16 10:59:05 +00:00
Drobysh 400cf375be [Eva] Добавляю идеальные серии и XP-достижения 2026-10-16 10:58:06 +00:00
Drobysh 11ef94a9bf [Eva] Добавляю sentence_speed_3 и серии без ошибок 2026-10-16 10:57:53 +00:00
Drobysh ed60a54e0c [Eva] Добавляю sentence_500 и sentence_1000 2026-10-16 10:57:42 +00:00
Drobysh 2d687904b0 [Eva] Удаляю 3 мёртвых достижения предложений 2026-10-16 10:57:12 +00:00
Drobysh c7ca0c97c2 [Eva] Sentence Builder: заголовок 10 → 20 2026-10-16 10:57:09 +00:00
Drobysh 3dfe34f18a [Eva] Добавляем 3 новых типа достижений в /check 2026-10-16 10:56:48 +00:00
Drobysh 61fbbe55e8 [Eva] Читаем sentence_stats для достижений 2026-10-16 10:56:45 +00:00
Drobysh 7cbde183ff [Eva] B2.3: убрать stars из ответа (KeyError) 2026-10-16 10:49:07 +00:00
Drobysh da3f1567a8 [Eva] B2.3: формула очков по сложности + серии в sentence_stats 2026-10-16 10:49:00 +00:00
Drobysh 82eb9208d8 [Eva] B2.3: already_completed по completed_at IS NOT NULL 2026-10-16 10:48:50 +00:00
Drobysh 5b2dbc0d42 [Eva] B2.2: новый эндпоинт POST /sentences/show-answer 2026-10-16 10:48:37 +00:00
Drobysh 3548654d6a [Eva] B2.1: /next создаёт строку прогресса (in-progress) 2026-10-16 10:48:26 +00:00
Drobysh 4e78c32c18 [Eva] B2.1: /next исключает только завершённые предложения 2026-10-16 10:48:17 +00:00
Drobysh 5be242aafd [Eva] Добавлена таблица sentence_stats + идемпотентные миграции 2026-10-16 10:46:30 +00:00
Drobysh 10242f89b3 [Eva] B1: миграции sentence_progress (list_opened, no_mistakes_streak, perfect_streak, completion_time) 2026-10-16 10:37:29 +00:00
Drobysh 299c4e2fd5 Merge pull request '[Eva] Ева, критичный фикс в wordquiz.py — 500' (#49) from eva/chat-55df46-backend into main
Reviewed-on: #49
2026-10-15 17:46:02 +00:00
Drobysh 38e0c2fe80 [Eva] Fix 500 on /wordquiz/next: LIMIT (wrong_count + 1) → LIMIT 5 (fallback) 2026-10-15 17:45:27 +00:00
Drobysh d669b37397 [Eva] Fix 500 on /wordquiz/next: LIMIT (wrong_count + 1) → LIMIT 5 2026-10-15 17:45:24 +00:00
Drobysh d334bc958d Merge pull request '[Eva] Ева, начинаем новую игру ChooseWord («Уг' (#47) from eva/chat-d4b957-backend into main
Reviewed-on: #47
2026-10-15 17:11:32 +00:00
Drobysh ccd733ba36 [Eva] /check: новые триггеры достижений 2026-10-15 17:10:37 +00:00
Drobysh b7c6bd9ebe [Eva] /check: накопление no_mistakes_streak + запись 2026-10-15 17:10:33 +00:00
Drobysh b25f27fcfe [Eva] /check: читаем no_mistakes_streak 2026-10-15 17:10:28 +00:00
Drobysh 69224b546b [Eva] 6 новых достижений Word Quiz (часть 2) 2026-10-15 17:09:58 +00:00
Drobysh d375a1e1ac [Eva] 6 новых достижений Word Quiz (часть 1) 2026-10-15 17:09:42 +00:00
Drobysh 739cda7eb8 [Eva] quiz_speed_2: тип → quiz_speed_2 2026-10-15 17:09:14 +00:00
Drobysh 8f96c61f29 [Eva] quiz_speed: тип → quiz_speed_3 2026-10-15 17:09:11 +00:00
Drobysh 96abab9883 [Eva] quiz_streak_20: тип → quiz_correct_streak 2026-10-15 17:09:08 +00:00
Drobysh 689a2258c0 [Eva] quiz_perfect_10: тип → quiz_correct_streak 2026-10-15 17:09:05 +00:00
Drobysh cc8e0e01f0 [Eva] Заголовок секции Word Quiz 8 → 20 2026-10-15 17:08:51 +00:00
Drobysh 7d5e3a7d8f [Eva] Миграция: no_mistakes_streak в word_quiz_progress 2026-10-15 17:08:48 +00:00
Drobysh 934e81a55a [Eva] ChooseWord /check: убираю поле stars из ответа 2026-10-15 17:02:13 +00:00
Drobysh 7e8c0e132e [Eva] ChooseWord /check: очки по сложности вместо звёзд 2026-10-15 17:02:06 +00:00
Drobysh af3c634bfd [Eva] ChooseWord /check: проверка языка + difficulty 2026-10-15 17:01:58 +00:00
Drobysh 7ddfc2e451 [Eva] ChooseWord /next: time_limit + новый return 2026-10-15 17:01:55 +00:00
Drobysh 34bae9bb6a [Eva] ChooseWord /next: обрезка вариантов по wrong_count 2026-10-15 17:01:52 +00:00
Drobysh 175691136e [Eva] ChooseWord /next: проверка минимума по wrong_count 2026-10-15 17:01:47 +00:00
Drobysh 7f5fc8311c [Eva] ChooseWord /next: LIMIT fallback по wrong_count 2026-10-15 17:01:44 +00:00
Drobysh edf29cb806 [Eva] ChooseWord /next: LIMIT по wrong_count 2026-10-15 17:01:41 +00:00
Drobysh 279fc5f313 [Eva] ChooseWord /next: проверка языка + wrong_count по сложности 2026-10-15 17:01:39 +00:00
Drobysh 07eebf6fed [Eva] ChooseWord /next: читаем difficulty из users 2026-10-15 17:01:35 +00:00
Drobysh c60f9a39c2 Merge pull request '[Eva] Ева, привет! Задача — собрать анамнез по' (#46) from eva/chat-42ebdc-backend into main
Reviewed-on: #46
2026-10-15 08:13:21 +00:00
Drobysh ced4cd1c8e [Eva] Триггеры новых достижений bubble_words/no_mistakes/streak/xp/speed_15/perfect_streak 2026-10-15 08:12:53 +00:00
Drobysh 25b1437e0b [Eva] Накопление счётчиков words_collected/no_hints_streak/perfect_streak в /complete 2026-10-15 08:12:49 +00:00
Drobysh d77d9bdaef [Eva] achievements: +4 достижения Bubble Words (часть 3) 2026-10-15 08:10:23 +00:00
Drobysh 85a168e8d7 [Eva] achievements: +4 достижения Bubble Words (часть 2) 2026-10-15 08:10:12 +00:00
Drobysh 7204111ad6 [Eva] achievements: +4 достижения Bubble Words (часть 1) 2026-10-15 08:09:54 +00:00
Drobysh 214567383e [Eva] achievements: Bubble Words 8 → 20 (заголовок секции) 2026-10-15 08:07:30 +00:00
Drobysh 3257b5da3b [Eva] Миграция: 3 колонки в bubble_words_progress (words_collected, no_hints_streak, perfect_streak) 2026-10-15 08:05:27 +00:00
Drobysh 92780b247d [Eva] bubble_speed_30: тип bubble_speed → bubble_speed_30 2026-10-15 08:01:19 +00:00
Drobysh eeb5a382c9 [Eva] bubble_speed: тип bubble_speed → bubble_speed_45 2026-10-15 08:01:16 +00:00
Drobysh ab45d026dd [Eva] bubblewords: передаём тип bubble_speed_45 2026-10-15 08:01:06 +00:00
Drobysh b6a8783ad0 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#45) from eva/chat-b7c183-backend into main
Reviewed-on: #45
2026-10-14 16:52:17 +00:00
Drobysh 8918309501 [Eva] Добавить удаление осиротевших достижений в init_achievements 2026-10-14 16:50:33 +00:00
Drobysh 1afc7a1654 [Eva] Удалить 7 неактуальных достижений 2026-10-14 16:50:21 +00:00
Drobysh 5fc49d086d [Eva] Поправить счётчик секции General 15 → 9 2026-10-14 16:49:27 +00:00
Drobysh 5a6b81da1d [Eva] Поправить счётчик достижений 52 → 55 2026-10-14 16:49:17 +00:00
Drobysh abc3a8ae7d Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#44) from eva/chat-b7c183-backend into main
Reviewed-on: #44
2026-10-14 11:59:16 +00:00
Drobysh 7c43812475 [Eva] bubblewords /next: число слов по сложности (easy 3, medium 4, hard 5) 2026-10-14 11:53:50 +00:00
Drobysh 3f7e7ef8d6 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#43) from eva/chat-b7c183-backend into main
Reviewed-on: #43
2026-10-14 11:06:40 +00:00
Drobysh e7c512e50e [Eva] fix first_part_hint: json.loads для current_level_words и hinted_words 2026-10-14 11:05:46 +00:00
Drobysh 0d6b56e5c9 [Eva] fix show_words: json.loads для current_level_words 2026-10-14 11:05:43 +00:00
Drobysh 4bbaa0030f Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#42) from eva/chat-b7c183-backend into main
Reviewed-on: #42
2026-10-14 09:37:45 +00:00
Drobysh 99dd3765d0 [Eva] bubblewords /next: возвращаем difficulty в ответе 2026-10-14 09:37:14 +00:00
Drobysh 929420a284 [Eva] bubblewords /next: читаем difficulty из users 2026-10-14 09:37:10 +00:00
Drobysh 3c60cfed31 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#41) from eva/chat-b7c183-backend into main
Reviewed-on: #41
2026-10-14 09:25:07 +00:00
Drobysh 6399d3931c [Eva] bubblewords: очистка состояния + сброс счётчиков в /complete 2026-10-14 09:20:09 +00:00
Drobysh 07d2d197fd [Eva] bubblewords: читать серверные счётчики hints+list 2026-10-14 09:19:59 +00:00
Drobysh 1f7ac86ef5 [Eva] bubblewords: убрать list_opened из body 2026-10-14 09:19:51 +00:00
Drobysh 16b8956b87 [Eva] Добавлен POST /bubblewords/show-words 2026-10-14 09:18:24 +00:00
Drobysh 959b9c4e3f [Eva] Добавлен POST /bubblewords/first-part-hint 2026-10-14 09:16:37 +00:00
Drobysh 4355b94291 [Eva] /next сохраняет состояние уровня и сбрасывает счётчики 2026-10-14 09:13:34 +00:00
Drobysh bd45071142 [Eva] Добавлен import json в bubblewords.py 2026-10-14 09:13:29 +00:00
Drobysh 13fcc8240d [Eva] Добавить 3 колонки в bubble_words_progress (current_list_opened, current_level_words, hinted_words) 2026-10-14 09:10:45 +00:00
Drobysh 118345f701 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#40) from eva/chat-b7c183-backend into main
Reviewed-on: #40
2026-10-14 09:03:24 +00:00
Drobysh 4159d6265a [Eva] bubblewords: убираю xp_result["stars"] (KeyError) 2026-10-14 09:01:33 +00:00
Drobysh 741d1799e7 [Eva] bubblewords: bubble_perfect по новой логике 2026-10-14 09:01:21 +00:00
Drobysh 5644b5be16 [Eva] bubblewords: новая формула очков вместо звёзд 2026-10-14 09:01:12 +00:00
Drobysh e65bd5db43 [Eva] bubblewords: читаем difficulty из users 2026-10-14 09:01:02 +00:00
Drobysh 6786acb126 Merge pull request '[Eva] Ева, прочитай .gitignore' (#39) from eva/chat-c3088d-backend into main
Reviewed-on: #39
2026-10-13 17:47:26 +00:00
Drobysh 938d674b09 Merge pull request '[Eva] Ева, прочитай .gitignore' (#38) from eva/chat-c3088d-backend into main
Reviewed-on: #38
2026-10-13 16:36:33 +00:00
Drobysh 78d40364bf Merge pull request '[Eva] Ева, прочитай .gitignore' (#37) from eva/chat-c3088d-backend into main
Reviewed-on: #37
2026-10-13 12:07:23 +00:00
Drobysh 26442db954 Merge pull request '[Eva] Ева, прочитай .gitignore' (#36) from eva/chat-c3088d-backend into main
Reviewed-on: #36
2026-10-13 12:02:29 +00:00
Drobysh 50c02b7707 Merge pull request '[Eva] Ева, прочитай .gitignore' (#35) from eva/chat-c3088d-backend into main
Reviewed-on: #35
2026-10-13 11:34:18 +00:00
Drobysh 22e4eed3f5 Merge pull request '[Eva] Ева, прочитай .gitignore' (#34) from eva/chat-c3088d-backend into main
Reviewed-on: #34
2026-10-13 11:29:59 +00:00
Drobysh 8b98655716 Merge pull request '[Eva] Ева, прочитай .gitignore' (#33) from eva/chat-c3088d-backend into main
Reviewed-on: #33
2026-10-13 11:23:15 +00:00
5 changed files with 842 additions and 138 deletions
+213
View File
@@ -300,6 +300,60 @@ async def init_db():
""") """)
logger.info("Added level column to sentence_progress") 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 ============ # ============ typing_progress ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS typing_progress ( CREATE TABLE IF NOT EXISTS typing_progress (
@@ -863,6 +917,20 @@ async def init_db():
""") """)
logger.info("Added current_mistakes column to word_quiz_progress") logger.info("Added current_mistakes column to word_quiz_progress")
# 🔧 НОВОЕ (15.10.2026): no_mistakes_streak — серия раундов без ошибок
# в «Выбери слово». +1 если раунд пройден без ошибок, иначе сброс в 0.
# Нужен для достижения quiz_no_mistakes_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'word_quiz_progress' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE word_quiz_progress
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to word_quiz_progress")
# ============ bubble_words_progress ============ # ============ bubble_words_progress ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS bubble_words_progress ( CREATE TABLE IF NOT EXISTS bubble_words_progress (
@@ -898,6 +966,151 @@ async def init_db():
""") """)
logger.info("Added current_hints_used column to bubble_words_progress") logger.info("Added current_hints_used column to bubble_words_progress")
# 🔧 НОВОЕ (14.10.2026): current_list_opened — серверный счётчик
# «показать слова» для текущего уровня пузырей. Medium — 1 раз.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'current_list_opened'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN current_list_opened INT DEFAULT 0
""")
logger.info("Added current_list_opened column to bubble_words_progress")
# 🔧 НОВОЕ (14.10.2026): current_level_words — состояние текущего
# уровня пузырей (слова + части + переводы). Нужно для подсказок,
# т.к. уровень генерируется на лету в /next и нигде не хранится.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'current_level_words'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN current_level_words JSONB DEFAULT '[]'::jsonb
""")
logger.info("Added current_level_words column to bubble_words_progress")
# 🔧 НОВОЕ (14.10.2026): hinted_words — какие слова уже получили
# подсказку «первая часть» (для «каждый раз разное слово»).
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'hinted_words'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN hinted_words TEXT[] DEFAULT '{}'
""")
logger.info("Added hinted_words column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): words_collected — суммарно собранных слов
# в пузырях. Нужен для достижения bubble_words (собрать N слов).
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'words_collected'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN words_collected INTEGER DEFAULT 0
""")
logger.info("Added words_collected column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): no_hints_streak — серия уровней БЕЗ подсказок
# и без «показать слова». +1 если hints_used == 0 и not list_opened,
# иначе сброс в 0. Нужен для достижения bubble_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'no_hints_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN no_hints_streak INTEGER DEFAULT 0
""")
logger.info("Added no_hints_streak column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): perfect_streak — серия идеальных уровней
# (без подсказок + без списка + без ошибок). +1 если всё чисто,
# иначе сброс в 0. Нужен для достижения bubble_perfect_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
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 ============ # ============ wrong_because_explanations ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS wrong_because_explanations ( CREATE TABLE IF NOT EXISTS wrong_because_explanations (
+208 -58
View File
@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
router = APIRouter(prefix="/achievements", tags=["achievements"]) router = APIRouter(prefix="/achievements", tags=["achievements"])
# ============ Данные 52 достижений ============ # ============ Данные 55 достижений ============
ACHIEVEMENTS_DATA = [ ACHIEVEMENTS_DATA = [
# ===== Word Search (11) ===== # ===== Word Search (11) =====
{"code": "first_level", "category": "wordsearch", "icon": "🔰", {"code": "first_level", "category": "wordsearch", "icon": "🔰",
@@ -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", "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}, "type": "wordsearch_xp", "value": 10000},
# ===== Sentence Builder (10) ===== # ===== Sentence Builder (20) =====
{"code": "first_sentence", "category": "sentence", "icon": "📝", {"code": "first_sentence", "category": "sentence", "icon": "📝",
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant", "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", "desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence",
@@ -138,20 +138,16 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences", "desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences",
"type": "sentences_completed", "value": 200}, "type": "sentences_completed", "value": 200},
{"code": "perfect_sentence_5", "category": "sentence", "icon": "✨", {"code": "sentence_500", "category": "sentence", "icon": "🌟",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist", "name_pl": "Legenda zdań", "name_ru": "Легенда предложений", "name_uk": "Легенда речень", "name_en": "Sentence Legend",
"desc_pl": "Ułóż 5 zdań bez błędu", "desc_ru": "Составить 5 предложений без единой ошибки", "desc_uk": "Скласти 5 речень без жодної помилки", "desc_en": "Build 5 sentences without mistakes", "desc_pl": "Ułóż 500 zdań", "desc_ru": "Составить 500 предложений", "desc_uk": "Скласти 500 речень", "desc_en": "Build 500 sentences",
"type": "perfect_sentences", "value": 5}, "type": "sentences_completed", "value": 500},
{"code": "sentence_perfect_10", "category": "sentence", "icon": "💎", {"code": "sentence_1000", "category": "sentence", "icon": "👑",
"name_pl": "Mistrz zdań", "name_ru": "Мастер предложений", "name_uk": "Майстер речень", "name_en": "Sentence Master", "name_pl": "Guru zdań", "name_ru": "Гуру предложений", "name_uk": "Гуру речень", "name_en": "Sentence Guru",
"desc_pl": "Ułóż 10 zdań bez błędu", "desc_ru": "Составить 10 предложений без ошибок", "desc_uk": "Скласти 10 речень без помилок", "desc_en": "Build 10 sentences without mistakes", "desc_pl": "Ułóż 1000 zdań", "desc_ru": "Составить 1000 предложений", "desc_uk": "Скласти 1000 речень", "desc_en": "Build 1000 sentences",
"type": "perfect_sentences", "value": 10}, "type": "sentences_completed", "value": 1000},
{"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": "🚀", {"code": "speed_10", "category": "sentence", "icon": "🚀",
"name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo", "name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo",
@@ -162,8 +158,63 @@ ACHIEVEMENTS_DATA = [
"name_pl": "Ekspres", "name_ru": "Экспресс", "name_uk": "Експрес", "name_en": "Express", "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", "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}, "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},
{"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 (8) ===== # ===== Word Quiz (20) =====
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠", {"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
"name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker", "name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker",
"desc_pl": "Odgadnij 10 słów w Quiz słownym", "desc_ru": "Угадать 10 слов в Квизе слов", "desc_uk": "Відгадати 10 слів у Квізі слів", "desc_en": "Guess 10 words in Word Quiz", "desc_pl": "Odgadnij 10 słów w Quiz słownym", "desc_ru": "Угадать 10 слов в Квизе слов", "desc_uk": "Відгадати 10 слів у Квізі слів", "desc_en": "Guess 10 words in Word Quiz",
@@ -182,29 +233,89 @@ ACHIEVEMENTS_DATA = [
{"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎", {"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎",
"name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score", "name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score",
"desc_pl": "Odgadnij 10 słów bez pomyłki", "desc_ru": "Угадать 10 слов без ошибок", "desc_uk": "Відгадати 10 слів без помилок", "desc_en": "Guess 10 words without mistakes", "desc_pl": "Odgadnij 10 słów bez pomyłki", "desc_ru": "Угадать 10 слов без ошибок", "desc_uk": "Відгадати 10 слів без помилок", "desc_en": "Guess 10 words without mistakes",
"type": "quiz_perfect_streak", "value": 10}, "type": "quiz_correct_streak", "value": 10},
{"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥", {"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥",
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable", "name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
"desc_pl": "Odgadnij 20 słów z rzędu", "desc_ru": "Угадать 20 слов подряд", "desc_uk": "Відгадати 20 слів поспіль", "desc_en": "Guess 20 words in a row", "desc_pl": "Odgadnij 20 słów z rzędu", "desc_ru": "Угадать 20 слов подряд", "desc_uk": "Відгадати 20 слів поспіль", "desc_en": "Guess 20 words in a row",
"type": "quiz_perfect_streak", "value": 20}, "type": "quiz_correct_streak", "value": 20},
{"code": "quiz_speed", "category": "wordquiz", "icon": "⚡", {"code": "quiz_speed", "category": "wordquiz", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning", "name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Odgadnij słowo w mniej niż 3 sekundy", "desc_ru": "Угадать слово быстрее 3 секунд", "desc_uk": "Відгадати слово швидше 3 секунд", "desc_en": "Guess a word in under 3 seconds", "desc_pl": "Odgadnij słowo w mniej niż 3 sekundy", "desc_ru": "Угадать слово быстрее 3 секунд", "desc_uk": "Відгадати слово швидше 3 секунд", "desc_en": "Guess a word in under 3 seconds",
"type": "quiz_speed", "value": 3}, "type": "quiz_speed_3", "value": 3},
{"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀", {"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀",
"name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast", "name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast",
"desc_pl": "Odgadnij słowo w mniej niż 2 sekundy", "desc_ru": "Угадать слово быстрее 2 секунд", "desc_uk": "Відгадати слово швидше 2 секунд", "desc_en": "Guess a word in under 2 seconds", "desc_pl": "Odgadnij słowo w mniej niż 2 sekundy", "desc_ru": "Угадать слово быстрее 2 секунд", "desc_uk": "Відгадати слово швидше 2 секунд", "desc_en": "Guess a word in under 2 seconds",
"type": "quiz_speed", "value": 2}, "type": "quiz_speed_2", "value": 2},
{"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆", {"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆",
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless", "name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Odgadnij słowo bez żadnej pomyłki", "desc_ru": "Угадать слово без единой ошибки", "desc_uk": "Відгадати слово без жодної помилки", "desc_en": "Guess a word without any mistakes", "desc_pl": "Odgadnij słowo bez żadnej pomyłki", "desc_ru": "Угадать слово без единой ошибки", "desc_uk": "Відгадати слово без жодної помилки", "desc_en": "Guess a word without any mistakes",
"type": "quiz_no_mistakes", "value": 1}, "type": "quiz_no_mistakes", "value": 1},
# ===== Bubble Words (8) ===== {"code": "quiz_1", "category": "wordquiz", "icon": "🎯",
"name_pl": "Pierwszy krok", "name_ru": "Первый шаг", "name_uk": "Перший крок", "name_en": "First Step",
"desc_pl": "Odgadnij 1 słowo", "desc_ru": "Угадать 1 слово", "desc_uk": "Вгадати 1 слово", "desc_en": "Guess 1 word",
"type": "quiz_guessed", "value": 1},
{"code": "quiz_25", "category": "wordquiz", "icon": "🎓",
"name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student",
"desc_pl": "Odgadnij 25 słów", "desc_ru": "Угадать 25 слов", "desc_uk": "Вгадати 25 слів", "desc_en": "Guess 25 words",
"type": "quiz_guessed", "value": 25},
{"code": "quiz_200", "category": "wordquiz", "icon": "📚",
"name_pl": "Erudyta", "name_ru": "Эрудит", "name_uk": "Ерудит", "name_en": "Erudite",
"desc_pl": "Odgadnij 200 słów", "desc_ru": "Угадать 200 слов", "desc_uk": "Вгадати 200 слів", "desc_en": "Guess 200 words",
"type": "quiz_guessed", "value": 200},
{"code": "quiz_500", "category": "wordquiz", "icon": "🌟",
"name_pl": "Legenda", "name_ru": "Легенда", "name_uk": "Легенда", "name_en": "Legend",
"desc_pl": "Odgadnij 500 słów", "desc_ru": "Угадать 500 слов", "desc_uk": "Вгадати 500 слів", "desc_en": "Guess 500 words",
"type": "quiz_guessed", "value": 500},
{"code": "quiz_1000", "category": "wordquiz", "icon": "👑",
"name_pl": "Guru", "name_ru": "Гуру", "name_uk": "Гуру", "name_en": "Guru",
"desc_pl": "Odgadnij 1000 słów", "desc_ru": "Угадать 1000 слов", "desc_uk": "Вгадати 1000 слів", "desc_en": "Guess 1000 words",
"type": "quiz_guessed", "value": 1000},
{"code": "quiz_correct_streak_5", "category": "wordquiz", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
"desc_pl": "5 poprawnych z rzędu", "desc_ru": "5 правильных подряд", "desc_uk": "5 правильних поспіль", "desc_en": "5 correct in a row",
"type": "quiz_correct_streak", "value": 5},
{"code": "quiz_streak_30", "category": "wordquiz", "icon": "💪",
"name_pl": "Na fali", "name_ru": "На волне", "name_uk": "На хвилі", "name_en": "On Fire",
"desc_pl": "30 poprawnych z rzędu", "desc_ru": "30 правильных подряд", "desc_uk": "30 правильних поспіль", "desc_en": "30 correct in a row",
"type": "quiz_correct_streak", "value": 30},
{"code": "quiz_streak_50", "category": "wordquiz", "icon": "🏆",
"name_pl": "Niezwyciężony", "name_ru": "Непобедимый", "name_uk": "Непереможний", "name_en": "Invincible",
"desc_pl": "50 poprawnych z rzędu", "desc_ru": "50 правильных подряд", "desc_uk": "50 правильних поспіль", "desc_en": "50 correct in a row",
"type": "quiz_correct_streak", "value": 50},
{"code": "quiz_no_mistakes_3", "category": "wordquiz", "icon": "✨",
"name_pl": "Czysta trójka", "name_ru": "Чистая тройка", "name_uk": "Чиста трійка", "name_en": "Clean Three",
"desc_pl": "3 rundy bez błędu z rzędu", "desc_ru": "3 раунда без ошибок подряд", "desc_uk": "3 раунди без помилок поспіль", "desc_en": "3 rounds without mistakes in a row",
"type": "quiz_no_mistakes_streak", "value": 3},
{"code": "quiz_perfect_25", "category": "wordquiz", "icon": "💎",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist",
"desc_pl": "25 rund bez błędu z rzędu", "desc_ru": "25 раундов без ошибок подряд", "desc_uk": "25 раундів без помилок поспіль", "desc_en": "25 rounds without mistakes in a row",
"type": "quiz_no_mistakes_streak", "value": 25},
{"code": "quiz_speed_5", "category": "wordquiz", "icon": "⚡",
"name_pl": "Szybki", "name_ru": "Быстрый", "name_uk": "Швидкий", "name_en": "Fast",
"desc_pl": "Odgadnij słowo w mniej niż 5 sekund", "desc_ru": "Угадать слово быстрее 5 секунд", "desc_uk": "Вгадати слово швидше 5 секунд", "desc_en": "Guess a word in under 5 seconds",
"type": "quiz_speed_5", "value": 5},
{"code": "quiz_speed_1", "category": "wordquiz", "icon": "🚀",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Odgadnij słowo w mniej niż 1 sekundę", "desc_ru": "Угадать слово быстрее 1 секунды", "desc_uk": "Вгадати слово швидше 1 секунди", "desc_en": "Guess a word in under 1 second",
"type": "quiz_speed_1", "value": 1},
# ===== Bubble Words (20) =====
{"code": "bubble_5", "category": "bubblewords", "icon": "🫧", {"code": "bubble_5", "category": "bubblewords", "icon": "🫧",
"name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner", "name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner",
"desc_pl": "Ukończ 5 poziomów w Bąbelkach słów", "desc_ru": "Пройти 5 уровней в Пузырях слов", "desc_uk": "Пройти 5 рівнів у Бульбашках слів", "desc_en": "Complete 5 levels in Bubble Words", "desc_pl": "Ukończ 5 poziomów w Bąbelkach słów", "desc_ru": "Пройти 5 уровней в Пузырях слов", "desc_uk": "Пройти 5 рівнів у Бульбашках слів", "desc_en": "Complete 5 levels in Bubble Words",
@@ -238,14 +349,74 @@ ACHIEVEMENTS_DATA = [
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀", {"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles", "name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
"desc_pl": "Ukończ poziom w mniej niż 45 sekund", "desc_ru": "Пройти уровень быстрее 45 секунд", "desc_uk": "Пройти рівень швидше 45 секунд", "desc_en": "Complete a level in under 45 seconds", "desc_pl": "Ukończ poziom w mniej niż 45 sekund", "desc_ru": "Пройти уровень быстрее 45 секунд", "desc_uk": "Пройти рівень швидше 45 секунд", "desc_en": "Complete a level in under 45 seconds",
"type": "bubble_speed", "value": 45}, "type": "bubble_speed_45", "value": 45},
{"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡", {"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡",
"name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning", "name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning",
"desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds", "desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds",
"type": "bubble_speed", "value": 30}, "type": "bubble_speed_30", "value": 30},
# ===== General (15) ===== {"code": "bubble_1", "category": "bubblewords", "icon": "🫧",
"name_pl": "Pierwszy bąbelek", "name_ru": "Первый пузырь", "name_uk": "Перша бульбашка", "name_en": "First Bubble",
"desc_pl": "Ukończ 1 poziom w Bąbelkach słów", "desc_ru": "Пройти 1 уровень в Пузырях слов", "desc_uk": "Пройти 1 рівень у Бульбашках слів", "desc_en": "Complete 1 level in Bubble Words",
"type": "bubble_levels", "value": 1},
{"code": "bubble_10", "category": "bubblewords", "icon": "🫧",
"name_pl": "Dziesięć bąbelków", "name_ru": "Десять пузырей", "name_uk": "Десять бульбашок", "name_en": "Ten Bubbles",
"desc_pl": "Ukończ 10 poziomów w Bąbelkach słów", "desc_ru": "Пройти 10 уровней в Пузырях слов", "desc_uk": "Пройти 10 рівнів у Бульбашках слів", "desc_en": "Complete 10 levels in Bubble Words",
"type": "bubble_levels", "value": 10},
{"code": "bubble_words_25", "category": "bubblewords", "icon": "📚",
"name_pl": "Kolekcjoner", "name_ru": "Собиратель", "name_uk": "Колекціонер", "name_en": "Collector",
"desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words",
"type": "bubble_words", "value": 25},
{"code": "bubble_no_mistakes", "category": "bubblewords", "icon": "✨",
"name_pl": "Bezbłędny", "name_ru": "Без ошибок", "name_uk": "Без помилок", "name_en": "No Mistakes",
"desc_pl": "Ukończ poziom bez żadnej pomyłki", "desc_ru": "Пройти уровень без единой ошибки", "desc_uk": "Пройти рівень без жодної помилки", "desc_en": "Complete a level without any mistakes",
"type": "bubble_no_mistakes", "value": 1},
{"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
"desc_pl": "Ukończ 3 poziomy z rzędu bez podpowiedzi", "desc_ru": "Пройти 3 уровня подряд без подсказок", "desc_uk": "Пройти 3 рівні поспіль без підказок", "desc_en": "Complete 3 levels in a row without hints",
"type": "bubble_streak", "value": 3},
{"code": "bubble_streak_10", "category": "bubblewords", "icon": "💪",
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
"desc_pl": "Ukończ 10 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 10 уровней подряд без подсказок", "desc_uk": "Пройти 10 рівнів поспіль без підказок", "desc_en": "Complete 10 levels in a row without hints",
"type": "bubble_streak", "value": 10},
{"code": "bubble_words_100", "category": "bubblewords", "icon": "📖",
"name_pl": "Sto słów", "name_ru": "Сто слов", "name_uk": "Сто слів", "name_en": "Hundred Words",
"desc_pl": "Zbierz 100 słów", "desc_ru": "Собрать 100 слов", "desc_uk": "Зібрати 100 слів", "desc_en": "Collect 100 words",
"type": "bubble_words", "value": 100},
{"code": "bubble_xp_1000", "category": "bubblewords", "icon": "💎",
"name_pl": "Bąbelkowy XP", "name_ru": "Пузырьковый XP", "name_uk": "Бульбашковий XP", "name_en": "Bubble XP",
"desc_pl": "Zdobądź 1000 XP w Bąbelkach", "desc_ru": "Набрать 1000 XP в пузырях", "desc_uk": "Набрати 1000 XP у бульбашках", "desc_en": "Earn 1000 XP in Bubbles",
"type": "bubble_xp", "value": 1000},
{"code": "bubble_200", "category": "bubblewords", "icon": "👑",
"name_pl": "Dwustu poziomów", "name_ru": "Двести уровней", "name_uk": "Двісті рівнів", "name_en": "Two Hundred Levels",
"desc_pl": "Ukończ 200 poziomów w Bąbelkach słów", "desc_ru": "Пройти 200 уровней в Пузырях слов", "desc_uk": "Пройти 200 рівнів у Бульбашках слів", "desc_en": "Complete 200 levels in Bubble Words",
"type": "bubble_levels", "value": 200},
{"code": "bubble_speed_15", "category": "bubblewords", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Ukończ poziom w mniej niż 15 sekund", "desc_ru": "Пройти уровень быстрее 15 секунд", "desc_uk": "Пройти рівень швидше 15 секунд", "desc_en": "Complete a level in under 15 seconds",
"type": "bubble_speed_15", "value": 15},
{"code": "bubble_perfect_10", "category": "bubblewords", "icon": "🌟",
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak",
"desc_pl": "Ukończ 10 idealnych poziomów z rzędu", "desc_ru": "Пройти 10 идеальных уровней подряд", "desc_uk": "Пройти 10 ідеальних рівнів поспіль", "desc_en": "Complete 10 perfect levels in a row",
"type": "bubble_perfect_streak", "value": 10},
{"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆",
"name_pl": "Pięćset słów", "name_ru": "Пятьсот слов", "name_uk": "П'ятсот слів", "name_en": "Five Hundred Words",
"desc_pl": "Zbierz 500 słów", "desc_ru": "Собрать 500 слов", "desc_uk": "Зібрати 500 слів", "desc_en": "Collect 500 words",
"type": "bubble_words", "value": 500},
# ===== General (9) =====
{"code": "score_1000", "category": "general", "icon": "🌟", {"code": "score_1000", "category": "general", "icon": "🌟",
"name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star", "name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star",
"desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points", "desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points",
@@ -291,42 +462,7 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language", "desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
"type": "language_changed", "value": 1}, "type": "language_changed", "value": 1},
# 🔧 ИСПРАВЛЕНО: Заменено достижение "Открой Грамматику" на "Открой меню учителя"
{"code": "open_teacher_menu", "category": "general", "icon": "🎓",
"name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student",
"desc_pl": "Otwórz menu nauczyciela", "desc_ru": "Открыть меню учителя", "desc_uk": "Відкрити меню вчителя", "desc_en": "Open the teacher menu",
"type": "teacher_menu_opened", "value": 1},
{"code": "open_cheatsheets", "category": "general", "icon": "📝",
"name_pl": "Ciekawski", "name_ru": "Любознательный", "name_uk": "Допитливий", "name_en": "Curious",
"desc_pl": "Otwórz sekcję Ściągi", "desc_ru": "Открыть раздел Шпаргалки", "desc_uk": "Відкрити розділ Шпаргалки", "desc_en": "Open the Cheatsheets section",
"type": "cheatsheets_opened", "value": 1},
{"code": "open_pronunciation", "category": "general", "icon": "🔊",
"name_pl": "Słuchacz", "name_ru": "Слушатель", "name_uk": "Слухач", "name_en": "Listener",
"desc_pl": "Otwórz sekcję Wymowa", "desc_ru": "Открыть раздел Произношение", "desc_uk": "Відкрити розділ Вимова", "desc_en": "Open the Pronunciation section",
"type": "pronunciation_opened", "value": 1},
{"code": "open_ai_assistant", "category": "general", "icon": "🤖",
"name_pl": "Asystent AI", "name_ru": "AI-помощник", "name_uk": "AI-помічник", "name_en": "AI Assistant",
"desc_pl": "Otwórz Asystenta AI", "desc_ru": "Открыть AI-помощника", "desc_uk": "Відкрити AI-помічника", "desc_en": "Open the AI Assistant",
"type": "ai_assistant_opened", "value": 1},
{"code": "open_alphabet", "category": "general", "icon": "🔤",
"name_pl": "Alfabetysta", "name_ru": "Алфавитист", "name_uk": "Алфавітист", "name_en": "Alphabetist",
"desc_pl": "Otwórz sekcję Alfabet", "desc_ru": "Открыть раздел Алфавит", "desc_uk": "Відкрити розділ Алфавіт", "desc_en": "Open the Alphabet section",
"type": "alphabet_opened", "value": 1},
{"code": "open_rules", "category": "general", "icon": "📐",
"name_pl": "Gramatyk", "name_ru": "Грамматик", "name_uk": "Граматик", "name_en": "Grammarian",
"desc_pl": "Otwórz sekcję Zasady", "desc_ru": "Открыть раздел Правила", "desc_uk": "Відкрити розділ Правила", "desc_en": "Open the Rules section",
"type": "rules_opened", "value": 1},
# 🔧 НОВОЕ: Достижение за открытие Прогресса
{"code": "open_progress", "category": "general", "icon": "📊",
"name_pl": "Planista", "name_ru": "Планировщик", "name_uk": "Планувальник", "name_en": "Planner",
"desc_pl": "Otwórz sekcję Postęp", "desc_ru": "Открыть раздел Прогресс", "desc_uk": "Відкрити розділ Прогрес", "desc_en": "Open the Progress section",
"type": "progress_opened", "value": 1},
] ]
@@ -369,6 +505,20 @@ async def init_achievements():
requirement_value = EXCLUDED.requirement_value requirement_value = EXCLUDED.requirement_value
""", rows) """, rows)
# 🔧 Удаление осиротевших достижений (которых больше нет в ACHIEVEMENTS_DATA)
await conn.execute("""
DELETE FROM user_achievements
WHERE achievement_id IN (
SELECT id FROM achievements
WHERE code NOT IN (SELECT unnest($1::text[]))
)
""", [a["code"] for a in ACHIEVEMENTS_DATA])
await conn.execute("""
DELETE FROM achievements
WHERE code NOT IN (SELECT unnest($1::text[]))
""", [a["code"] for a in ACHIEVEMENTS_DATA])
logger.info(f"[achievements] init: upserted {len(rows)} achievements") logger.info(f"[achievements] init: upserted {len(rows)} achievements")
+248 -31
View File
@@ -1,5 +1,6 @@
import random import random
import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования
import json
from fastapi import APIRouter, Request, HTTPException from fastapi import APIRouter, Request, HTTPException
from auth import require_auth from auth import require_auth
from database import get_pool from database import get_pool
@@ -100,7 +101,7 @@ async def get_next_bubble_level(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id "SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
) )
if not user: if not user:
raise HTTPException(401, "User not registered") raise HTTPException(401, "User not registered")
@@ -114,13 +115,9 @@ async def get_next_bubble_level(request: Request):
) )
current_bubble_level = (progress["levels_completed"] if progress else 0) + 1 current_bubble_level = (progress["levels_completed"] if progress else 0) + 1
# Прогрессия по количеству слов на уровне # Количество слов по сложности
if current_bubble_level <= 10: difficulty = user["difficulty"] if "difficulty" in user.keys() else "medium"
num_words = random.choice([3, 4]) num_words = {"easy": 3, "medium": 4, "hard": 5}.get(difficulty, 4)
elif current_bubble_level <= 25:
num_words = random.choice([5, 6])
else:
num_words = random.choice([7, 8])
# 🔧 ФИКС (30.09.2026): csv_words_source — # 🔧 ФИКС (30.09.2026): csv_words_source —
# источник слов переехал с level_words (старая схема level_id IS NULL) # источник слов переехал с level_words (старая схема level_id IS NULL)
@@ -162,10 +159,172 @@ async def get_next_bubble_level(request: Request):
random.shuffle(all_parts) random.shuffle(all_parts)
# 🔧 НОВОЕ (14.10.2026): сохраняем состояние уровня для подсказок
# и сбрасываем счётчики подсказок/списка при новом уровне.
level_state = [
{
"word_pl": w["word_pl"],
"translation": w["translation"],
"parts": w["parts"],
}
for w in result_words
]
await conn.execute("""
INSERT INTO bubble_words_progress
(user_id, levels_completed, total_score, level,
current_hints_used, current_list_opened, current_level_words, hinted_words)
VALUES ($1, 0, 0, $2, 0, 0, $3::jsonb, '{}')
ON CONFLICT (user_id) DO UPDATE
SET current_hints_used = 0,
current_list_opened = 0,
current_level_words = $3::jsonb,
hinted_words = '{}'
""", telegram_id, current_level, json.dumps(level_state))
return { return {
"words": result_words, "words": result_words,
"bubbles": all_parts, "bubbles": all_parts,
"level": current_bubble_level, "level": current_bubble_level,
"difficulty": user["difficulty"] or "medium",
}
@router.post("/first-part-hint")
async def first_part_hint(request: Request):
"""Подсказка «первая часть слова» — возвращает первый пузырь одного из несобранных слов.
🔧 НОВОЕ (14.10.2026): аналог GET /hints/first-letter/{level_id} из филворда.
Лимит 3 подсказки, штраф −20 (учитывается в /complete через current_hints_used).
Hard — запрещено (400).
"""
telegram_id, _ = await require_auth(request)
body = await request.json()
found_words = set(body.get("found_words", []) or [])
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"
if difficulty == "hard":
raise HTTPException(400, "Hints are disabled on Hard difficulty")
progress = await conn.fetchrow(
"SELECT current_hints_used, current_level_words, hinted_words "
"FROM bubble_words_progress WHERE user_id = $1",
telegram_id
)
if not progress:
raise HTTPException(404, "No active level")
hints_used = progress["current_hints_used"] or 0
if hints_used >= 3:
raise HTTPException(400, "All hints used")
raw = progress["current_level_words"]
if isinstance(raw, str):
level_words = json.loads(raw) if raw else []
else:
level_words = raw or []
raw_hinted = progress["hinted_words"]
if isinstance(raw_hinted, str):
hinted = set(json.loads(raw_hinted)) if raw_hinted else set()
else:
hinted = set(raw_hinted or [])
# Слова, которые ещё не собраны и которым ещё не давали подсказку
candidates = [
w for w in level_words
if w.get("word_pl") not in found_words and w.get("word_pl") not in hinted
]
if not candidates:
raise HTTPException(400, "All words already hinted")
chosen = random.choice(candidates)
word_pl = chosen["word_pl"]
parts = chosen.get("parts") or []
first_part = parts[0] if parts else word_pl
new_hints = hints_used + 1
new_hinted = sorted(hinted | {word_pl})
await conn.execute("""
UPDATE bubble_words_progress
SET current_hints_used = $2,
hinted_words = $3
WHERE user_id = $1
""", telegram_id, new_hints, new_hinted)
return {
"word_pl": word_pl,
"first_part": first_part,
"hints_used_total": new_hints,
}
@router.post("/show-words")
async def show_words(request: Request):
"""Подсказка «показать слова» — возвращает все загаданные слова с переводами.
🔧 НОВОЕ (14.10.2026): аналог show-words из филворда.
Easy — без лимита. Medium — 1 раз (−20). Hard — запрещено (400).
"""
telegram_id, _ = await require_auth(request)
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"
if difficulty == "hard":
raise HTTPException(400, "Word list is disabled on Hard difficulty")
progress = await conn.fetchrow(
"SELECT current_list_opened, current_level_words "
"FROM bubble_words_progress WHERE user_id = $1",
telegram_id
)
if not progress:
raise HTTPException(404, "No active level")
list_opened = progress["current_list_opened"] or 0
# Medium — список можно открыть только 1 раз
if difficulty == "medium" and list_opened >= 1:
raise HTTPException(400, "Word list already used on Medium difficulty")
raw = progress["current_level_words"]
if isinstance(raw, str):
level_words = json.loads(raw) if raw else []
else:
level_words = raw or []
words = [
{"word_pl": w.get("word_pl"), "translation": w.get("translation")}
for w in level_words
]
# Инкремент счётчика для Easy и Medium (Hard сюда не доходит)
new_list_opened = list_opened + 1
await conn.execute("""
UPDATE bubble_words_progress
SET current_list_opened = $2
WHERE user_id = $1
""", telegram_id, new_list_opened)
return {
"words": words,
"list_opened_total": new_list_opened,
} }
@@ -184,7 +343,6 @@ async def complete_bubble_level(request: Request):
body = await request.json() body = await request.json()
words_count = body.get("words_count", 3) words_count = body.get("words_count", 3)
completion_time = body.get("completion_time") completion_time = body.get("completion_time")
list_opened = bool(body.get("list_opened", False))
wrong_words = int(body.get("wrong_words", 0) or 0) wrong_words = int(body.get("wrong_words", 0) or 0)
pool = await get_pool() pool = await get_pool()
@@ -195,39 +353,76 @@ async def complete_bubble_level(request: Request):
if not user_exists: if not user_exists:
raise HTTPException(401, "User not registered") raise HTTPException(401, "User not registered")
current_level = await conn.fetchval( user = await conn.fetchrow(
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id "SELECT current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
) or "A1" )
current_level = user["current_level"] or "A1"
difficulty = user["difficulty"] or "medium"
# Читаем серверный hints_used # Читаем серверные счётчики (не из body)
hints_used = await conn.fetchval( progress = await conn.fetchrow(
"SELECT current_hints_used FROM bubble_words_progress WHERE user_id = $1", "SELECT current_hints_used, current_list_opened "
"FROM bubble_words_progress WHERE user_id = $1",
telegram_id telegram_id
) or 0 )
hints_used = (progress["current_hints_used"] if progress else 0) or 0
hints_used = min(max(0, hints_used), 3) hints_used = min(max(0, hints_used), 3)
list_opened = (progress["current_list_opened"] if progress else 0) or 0
# 🆕 Расчёт звёзд # 🔧 НОВОЕ (14.10.2026): очки по формуле филворда.
# Старт 5. Штрафы: hints(1) + wrong_words(до 3) + time(1) # Hard — фикс 110. Easy/Medium — 100 − 20×hints − 20×list + bonus.
time_penalty = 1 if (completion_time and completion_time > 60) else 0 if difficulty == "hard":
wrong_penalty = min(max(0, wrong_words), 3) if hints_used > 0 or list_opened:
hint_penalty = 1 if hints_used > 0 else 0 raise HTTPException(
list_penalty = 1 if list_opened else 0 status_code=400,
stars = max(1, 5 - time_penalty - wrong_penalty - hint_penalty - list_penalty) detail="Hints and word list are disabled on Hard difficulty"
)
points = 110
else:
bonus = 10 if hints_used == 0 else 0
penalty_hints = 20 * hints_used
penalty_list = 0 if difficulty == "easy" else 20 * (1 if list_opened else 0)
points = max(20, min(110, 100 - penalty_hints - penalty_list + bonus))
# Начисляем XP # Начисляем XP
from services.xp import award_xp from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "bubbles", stars) xp_result = await award_xp(conn, telegram_id, "bubbles", points)
score = xp_result["points"] score = xp_result["points"]
# 🔧 НОВОЕ (15.10.2026): флаги для накопления серий.
no_hints_clean = 1 if (hints_used == 0 and not list_opened) else 0
perfect_clean = 1 if (hints_used == 0 and not list_opened and wrong_words == 0) else 0
await conn.execute(""" await conn.execute("""
INSERT INTO bubble_words_progress (user_id, levels_completed, total_score, level, current_hints_used) INSERT INTO bubble_words_progress
VALUES ($1, 1, $2, $3, 0) (user_id, levels_completed, total_score, level,
current_hints_used, current_list_opened, current_level_words, hinted_words,
words_collected, no_hints_streak, perfect_streak)
VALUES ($1, 1, $2, $3, 0, 0, '[]'::jsonb, '{}', $4, $5, $6)
ON CONFLICT (user_id) DO UPDATE ON CONFLICT (user_id) DO UPDATE
SET levels_completed = bubble_words_progress.levels_completed + 1, SET levels_completed = bubble_words_progress.levels_completed + 1,
total_score = bubble_words_progress.total_score + $2, total_score = bubble_words_progress.total_score + $2,
level = $3, level = $3,
current_hints_used = 0 current_hints_used = 0,
""", telegram_id, score, current_level) current_list_opened = 0,
current_level_words = '[]'::jsonb,
hinted_words = '{}',
words_collected = COALESCE(bubble_words_progress.words_collected, 0) + $4,
no_hints_streak = CASE WHEN $5 = 1
THEN COALESCE(bubble_words_progress.no_hints_streak, 0) + 1 ELSE 0 END,
perfect_streak = CASE WHEN $6 = 1
THEN COALESCE(bubble_words_progress.perfect_streak, 0) + 1 ELSE 0 END
""", telegram_id, score, current_level, words_count, no_hints_clean, perfect_clean)
# 🔧 НОВОЕ (15.10.2026): читаем актуальные счётчики для проверки достижений.
stats = await conn.fetchrow("""
SELECT words_collected, no_hints_streak, perfect_streak, total_score
FROM bubble_words_progress WHERE user_id = $1
""", telegram_id)
words_collected = stats["words_collected"] or 0
no_hints_streak = stats["no_hints_streak"] or 0
perfect_streak = stats["perfect_streak"] or 0
bubble_total_score = stats["total_score"] or 0
# Данные для достижений # Данные для достижений
total_levels = await conn.fetchval( total_levels = await conn.fetchval(
@@ -241,13 +436,36 @@ async def complete_bubble_level(request: Request):
] ]
if hints_used == 0: if hints_used == 0:
achievements_to_check.append(("bubble_no_hints", 1)) achievements_to_check.append(("bubble_no_hints", 1))
if stars == 5: if hints_used == 0 and not list_opened and wrong_words == 0:
achievements_to_check.append(("bubble_perfect", 1)) achievements_to_check.append(("bubble_perfect", 1))
if completion_time is not None and 0 < completion_time <= 45: if completion_time is not None and 0 < completion_time <= 45:
achievements_to_check.append(("bubble_speed", 45)) achievements_to_check.append(("bubble_speed_45", 45))
if completion_time is not None and 0 < completion_time <= 30: if completion_time is not None and 0 < completion_time <= 30:
achievements_to_check.append(("bubble_speed_30", 30)) achievements_to_check.append(("bubble_speed_30", 30))
# 🔧 НОВОЕ (15.10.2026): триггеры новых достижений.
# bubble_words — всего слов собрано
achievements_to_check.append(("bubble_words", words_collected))
# bubble_no_mistakes — уровень без ошибок
if wrong_words == 0:
achievements_to_check.append(("bubble_no_mistakes", 1))
# bubble_streak — серия без подсказок (если > 0)
if no_hints_streak > 0:
achievements_to_check.append(("bubble_streak", no_hints_streak))
# bubble_xp — XP в пузырях (total_score — очки именно пузырей)
achievements_to_check.append(("bubble_xp", bubble_total_score))
# bubble_speed_15 — быстрее 15 сек
if completion_time is not None and 0 < completion_time <= 15:
achievements_to_check.append(("bubble_speed_15", 15))
# bubble_perfect_streak — серия идеальных (если > 0)
if perfect_streak > 0:
achievements_to_check.append(("bubble_perfect_streak", perfect_streak))
# Достижения — вне транзакции # Достижения — вне транзакции
from routers.achievements import check_and_award_achievements from routers.achievements import check_and_award_achievements
new_achievements = [] new_achievements = []
@@ -261,7 +479,6 @@ async def complete_bubble_level(request: Request):
"completion_time": completion_time, "completion_time": completion_time,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP-поля # 🆕 XP-поля
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],
+115 -22
View File
@@ -113,7 +113,7 @@ async def get_next_sentence(request: Request):
SELECT s.* FROM sentences s SELECT s.* FROM sentences s
WHERE s.level = $1 WHERE s.level = $1
AND s.id NOT IN ( 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() ORDER BY RANDOM()
LIMIT 1 LIMIT 1
@@ -122,6 +122,13 @@ async def get_next_sentence(request: Request):
if not row: if not row:
return {"completed": True, "message": "All sentences completed!"} 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() correct_words = row["sentence_pl"].split()
@@ -144,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") @router.post("/check")
async def check_sentence(request: Request): async def check_sentence(request: Request):
"""Проверка предложения с защитой от повторного прохождения и выдачей достижений""" """Проверка предложения с защитой от повторного прохождения и выдачей достижений"""
@@ -176,7 +236,7 @@ async def check_sentence(request: Request):
raise HTTPException(404, "Sentence not found") raise HTTPException(404, "Sentence not found")
existing_progress = await conn.fetchrow( 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 telegram_id, sentence_id
) )
@@ -208,36 +268,67 @@ async def check_sentence(request: Request):
is_correct = user_words_normalized == correct_words_normalized is_correct = user_words_normalized == correct_words_normalized
if is_correct: if is_correct:
word_count = len(correct_words_original) # 🔧 НОВОЕ (16.10.2026): очки по формуле сложностей.
# Easy — фикс 20. Medium — 60 − 20×list_opened (мин 20).
# 🆕 Расчёт звёзд для "Составь предложение" # Hard — 100, +50 бонус если completion_time <= 15 сек.
# Старт 5. Штрафы:
# -1 за каждую неверную проверку (клиент шлёт wrong_checks)
# -1 если time > лимита (по длине: 3-4 → 30с, 5-6 → 45с, 7-8 → 60с)
wrong_checks = int(body.get("wrong_checks", 0) or 0) wrong_checks = int(body.get("wrong_checks", 0) or 0)
if word_count <= 4: user_row = await conn.fetchrow(
time_limit = 30 "SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
elif word_count <= 6: )
time_limit = 45 difficulty = (user_row["difficulty"] if user_row else None) or "medium"
else:
time_limit = 60
time_penalty = 1 if (completion_time and completion_time > time_limit) else 0 progress_row = await conn.fetchrow(
wrong_penalty = min(max(0, wrong_checks), 3) "SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
stars = max(1, 5 - wrong_penalty - time_penalty) 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 # Начисляем XP
from services.xp import award_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"] score = xp_result["points"]
await conn.execute( await conn.execute(
"""INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level) """INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level, completion_time)
VALUES ($1, $2, NOW(), $3, $4)""", VALUES ($1, $2, NOW(), $3, $4, $5)
telegram_id, sentence_id, score, row["level"], 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)
# 🔧 НОВОЕ (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 — # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences —
# раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(), # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(),
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока, # что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
@@ -268,6 +359,9 @@ async def check_sentence(request: Request):
achievements_to_check = [ achievements_to_check = [
("sentences_completed", sentences_completed), ("sentences_completed", sentences_completed),
("total_score", grand_total), ("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: if completion_time is not None and completion_time > 0:
achievements_to_check.append(("speed_sentence", int(completion_time))) achievements_to_check.append(("speed_sentence", int(completion_time)))
@@ -287,7 +381,6 @@ async def check_sentence(request: Request):
"score": score, "score": score,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP # 🆕 XP
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],
+58 -27
View File
@@ -14,7 +14,7 @@ async def get_next_quiz(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id "SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
) )
if not user: if not user:
raise HTTPException(401, "User not registered") raise HTTPException(401, "User not registered")
@@ -22,6 +22,12 @@ async def get_next_quiz(request: Request):
lang = user["app_language"] or "pl" lang = user["app_language"] or "pl"
current_level = user["current_level"] or "A1" current_level = user["current_level"] or "A1"
if lang == 'pl':
raise HTTPException(403, "ChooseWord не поддерживает польский язык. Используйте другой язык.")
difficulty = user.get("difficulty") or "medium"
wrong_count = {"easy": 2, "medium": 3, "hard": 4}.get(difficulty, 3)
progress = await conn.fetchrow( progress = await conn.fetchrow(
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1", "SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
telegram_id telegram_id
@@ -73,7 +79,7 @@ async def get_next_quiz(request: Request):
LIMIT 5 LIMIT 5
""", current_level, correct_polish, *exclude_for_wrong) """, current_level, correct_polish, *exclude_for_wrong)
if len(wrong_words) < 2: if len(wrong_words) < wrong_count:
# 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words. # 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words.
wrong_words = await conn.fetch(""" wrong_words = await conn.fetch("""
SELECT word_pl SELECT word_pl
@@ -90,7 +96,7 @@ async def get_next_quiz(request: Request):
if wl not in seen: if wl not in seen:
wrong_options.append(w["word_pl"]) wrong_options.append(w["word_pl"])
seen.add(wl) seen.add(wl)
if len(wrong_options) >= 2: if len(wrong_options) >= wrong_count:
break break
recent_words = recent_words + [correct_polish] + wrong_options recent_words = recent_words + [correct_polish] + wrong_options
@@ -107,20 +113,14 @@ async def get_next_quiz(request: Request):
options = wrong_options + [correct_polish] options = wrong_options + [correct_polish]
random.shuffle(options) random.shuffle(options)
if total_guessed <= 10: time_limit = 10 if difficulty == "hard" else None
difficulty = "easy"
elif total_guessed <= 30:
difficulty = "medium"
elif total_guessed <= 60:
difficulty = "hard"
else:
difficulty = "expert"
return { return {
"correct_polish": correct_polish, "correct_polish": correct_polish,
"translation": translation, "translation": translation,
"options": options, "options": options,
"difficulty": difficulty, "difficulty": difficulty,
"time_limit": time_limit,
} }
@@ -157,6 +157,17 @@ async def check_quiz_answer(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
# Проверка языка
lang = await conn.fetchval(
"SELECT app_language FROM users WHERE telegram_id = $1", telegram_id
) or "pl"
if lang == 'pl':
raise HTTPException(403, "ChooseWord не поддерживает польский язык.")
difficulty = await conn.fetchval(
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
) or "medium"
# Читаем серверный streak и mistakes # Читаем серверный streak и mistakes
current_streak = await conn.fetchval( current_streak = await conn.fetchval(
"SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1", "SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1",
@@ -166,6 +177,10 @@ async def check_quiz_answer(request: Request):
"SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1", "SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1",
telegram_id telegram_id
) or 0 ) or 0
no_mistakes_streak = await conn.fetchval(
"SELECT no_mistakes_streak FROM word_quiz_progress WHERE user_id = $1",
telegram_id
) or 0
if is_correct: if is_correct:
current_streak += 1 current_streak += 1
@@ -183,32 +198,41 @@ async def check_quiz_answer(request: Request):
score = 0 score = 0
if is_correct: if is_correct:
# 🆕 Расчёт звёзд для "Выбери слово" # 🆕 Фиксированные очки по сложности (ChooseWord)
# Старт 5 звёзд. Штрафы: if difficulty == "easy":
# -1 за каждый неверный (макс 3) points = max(20, min(60, 60 - 20 * mistakes))
# -1 если time > 30 сек elif difficulty == "medium":
time_penalty = 1 if (completion_time and completion_time > 30) else 0 points = max(20, min(80, 80 - 20 * mistakes))
wrong_penalty = min(mistakes, 3) else: # hard
stars = max(1, 5 - wrong_penalty - time_penalty) points = max(20, min(110, 110 - 20 * mistakes))
if completion_time is not None and completion_time > 10:
points = 20
# Начисляем XP # Начисляем XP
from services.xp import award_xp from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "choose", stars) xp_result = await award_xp(conn, telegram_id, "choose", points)
score = xp_result["points"] score = xp_result["points"]
# no_mistakes_streak: +1 если раунд чистый, иначе сброс
if mistakes == 0:
no_mistakes_streak += 1
else:
no_mistakes_streak = 0
# Сбрасываем mistakes + обновляем серию # Сбрасываем mistakes + обновляем серию
await conn.execute(""" await conn.execute("""
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1 UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
""", telegram_id) """, telegram_id)
await conn.execute(""" await conn.execute("""
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak) INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, no_mistakes_streak)
VALUES ($1, 1, $2, $3) VALUES ($1, 1, $2, $3, $4)
ON CONFLICT (user_id) DO UPDATE ON CONFLICT (user_id) DO UPDATE
SET words_guessed = word_quiz_progress.words_guessed + 1, SET words_guessed = word_quiz_progress.words_guessed + 1,
total_score = word_quiz_progress.total_score + $2, total_score = word_quiz_progress.total_score + $2,
correct_streak = $3 correct_streak = $3,
""", telegram_id, score, current_streak) no_mistakes_streak = $4
""", telegram_id, score, current_streak, no_mistakes_streak)
# 🆕 Обновляем best_streak в choose_progress # 🆕 Обновляем best_streak в choose_progress
await conn.execute(""" await conn.execute("""
@@ -230,12 +254,20 @@ async def check_quiz_answer(request: Request):
("quiz_guessed", total_guessed), ("quiz_guessed", total_guessed),
("total_score", xp_result["total_xp"]), ("total_score", xp_result["total_xp"]),
] ]
if current_streak >= 10: if current_streak >= 5:
achievements_to_check.append(("quiz_perfect_streak", current_streak)) achievements_to_check.append(("quiz_correct_streak", current_streak))
if no_mistakes_streak > 0:
achievements_to_check.append(("quiz_no_mistakes_streak", no_mistakes_streak))
if mistakes == 0: if mistakes == 0:
achievements_to_check.append(("quiz_no_mistakes", 1)) achievements_to_check.append(("quiz_no_mistakes", 1))
if completion_time is not None and 0 < completion_time <= 5:
achievements_to_check.append(("quiz_speed_5", 5))
if completion_time is not None and 0 < completion_time <= 3: if completion_time is not None and 0 < completion_time <= 3:
achievements_to_check.append(("quiz_speed", 3)) achievements_to_check.append(("quiz_speed_3", 3))
if completion_time is not None and 0 < completion_time <= 2:
achievements_to_check.append(("quiz_speed_2", 2))
if completion_time is not None and 0 < completion_time <= 1:
achievements_to_check.append(("quiz_speed_1", 1))
else: else:
# При 3 ошибках — утешительный XP (10) # При 3 ошибках — утешительный XP (10)
if mistakes >= 3: if mistakes >= 3:
@@ -268,7 +300,6 @@ async def check_quiz_answer(request: Request):
"correct_streak": current_streak, "correct_streak": current_streak,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP-поля # 🆕 XP-поля
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],