Compare commits
103
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a679ca4e77 | ||
|
|
871d7167e2 | ||
|
|
8fce00f1e1 | ||
|
|
17f7ed7370 | ||
|
|
361e2d9b61 | ||
|
|
73c88678dc | ||
|
|
e8a8d9f11e | ||
|
|
7d52b0232b | ||
|
|
95058b2d3c | ||
|
|
8a78368458 | ||
|
|
20674f0823 | ||
|
|
3d379c8357 | ||
|
|
ba9a43dcfa | ||
|
|
3c9548540c | ||
|
|
5810eccde1 | ||
|
|
1df1119d11 | ||
|
|
bcf4db0ddb | ||
|
|
965d5d2503 | ||
|
|
a313c08b95 | ||
|
|
ce9f68ae51 | ||
|
|
400cf375be | ||
|
|
11ef94a9bf | ||
|
|
ed60a54e0c | ||
|
|
2d687904b0 | ||
|
|
c7ca0c97c2 | ||
|
|
3dfe34f18a | ||
|
|
61fbbe55e8 | ||
|
|
7cbde183ff | ||
|
|
da3f1567a8 | ||
|
|
82eb9208d8 | ||
|
|
5b2dbc0d42 | ||
|
|
3548654d6a | ||
|
|
4e78c32c18 | ||
|
|
5be242aafd | ||
|
|
10242f89b3 | ||
|
|
299c4e2fd5 | ||
|
|
38e0c2fe80 | ||
|
|
d669b37397 | ||
|
|
d334bc958d | ||
|
|
ccd733ba36 | ||
|
|
b7c6bd9ebe | ||
|
|
b25f27fcfe | ||
|
|
69224b546b | ||
|
|
d375a1e1ac | ||
|
|
739cda7eb8 | ||
|
|
8f96c61f29 | ||
|
|
96abab9883 | ||
|
|
689a2258c0 | ||
|
|
cc8e0e01f0 | ||
|
|
7d5e3a7d8f | ||
|
|
934e81a55a | ||
|
|
7e8c0e132e | ||
|
|
af3c634bfd | ||
|
|
7ddfc2e451 | ||
|
|
34bae9bb6a | ||
|
|
175691136e | ||
|
|
7f5fc8311c | ||
|
|
edf29cb806 | ||
|
|
279fc5f313 | ||
|
|
07eebf6fed | ||
|
|
c60f9a39c2 | ||
|
|
ced4cd1c8e | ||
|
|
25b1437e0b | ||
|
|
d77d9bdaef | ||
|
|
85a168e8d7 | ||
|
|
7204111ad6 | ||
|
|
214567383e | ||
|
|
3257b5da3b | ||
|
|
92780b247d | ||
|
|
eeb5a382c9 | ||
|
|
ab45d026dd | ||
|
|
b6a8783ad0 | ||
|
|
8918309501 | ||
|
|
1afc7a1654 | ||
|
|
5fc49d086d | ||
|
|
5a6b81da1d | ||
|
|
abc3a8ae7d | ||
|
|
7c43812475 | ||
|
|
3f7e7ef8d6 | ||
|
|
e7c512e50e | ||
|
|
0d6b56e5c9 | ||
|
|
4bbaa0030f | ||
|
|
99dd3765d0 | ||
|
|
929420a284 | ||
|
|
3c60cfed31 | ||
|
|
6399d3931c | ||
|
|
07d2d197fd | ||
|
|
1f7ac86ef5 | ||
|
|
16b8956b87 | ||
|
|
959b9c4e3f | ||
|
|
4355b94291 | ||
|
|
bd45071142 | ||
|
|
13fcc8240d | ||
|
|
118345f701 | ||
|
|
4159d6265a | ||
|
|
741d1799e7 | ||
|
|
5644b5be16 | ||
|
|
e65bd5db43 | ||
|
|
6786acb126 | ||
|
|
6fc8c83322 | ||
|
|
bffcb4387c | ||
|
|
01ce5dfa2d | ||
|
|
ec9108f2a3 |
+229
-5
@@ -258,20 +258,31 @@ async def init_db():
|
||||
)
|
||||
""")
|
||||
|
||||
# ============ Убираем старый UNIQUE constraint с sentences.sentence_number ============
|
||||
# ============ Убираем составной UNIQUE (level, sentence_number) ============
|
||||
await conn.execute("""
|
||||
ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_key
|
||||
ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_unique
|
||||
""")
|
||||
|
||||
# ============ Добавляем составной UNIQUE (level, sentence_number) ============
|
||||
# ============ Пересчёт номеров: единый пул 1..N ============
|
||||
await conn.execute("""
|
||||
UPDATE sentences s
|
||||
SET sentence_number = sub.rn
|
||||
FROM (
|
||||
SELECT id, ROW_NUMBER() OVER (ORDER BY id) AS rn
|
||||
FROM sentences
|
||||
) sub
|
||||
WHERE s.id = sub.id
|
||||
""")
|
||||
|
||||
# ============ Добавляем UNIQUE (sentence_number) ============
|
||||
await conn.execute("""
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM pg_constraint
|
||||
WHERE conname = 'sentences_sentence_number_unique'
|
||||
WHERE conname = 'sentences_sentence_number_key'
|
||||
) THEN
|
||||
ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_unique UNIQUE (level, sentence_number);
|
||||
ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_key UNIQUE (sentence_number);
|
||||
END IF;
|
||||
END $$;
|
||||
""")
|
||||
@@ -300,6 +311,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 (
|
||||
@@ -863,6 +928,20 @@ async def init_db():
|
||||
""")
|
||||
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 ============
|
||||
await conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS bubble_words_progress (
|
||||
@@ -898,6 +977,151 @@ async def init_db():
|
||||
""")
|
||||
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 ============
|
||||
await conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS wrong_because_explanations (
|
||||
|
||||
+1
-1
@@ -283,7 +283,7 @@
|
||||
| wrong_because | character varying | YES | |
|
||||
| edited_at | timestamp without time zone | YES | |
|
||||
|
||||
## sentence_hints_used
|
||||
## sentence_hints_used ⚠️ устаревшая (не используется)
|
||||
|
||||
| Колонка | Тип | NULL | Default |
|
||||
|---------|-----|------|---------|
|
||||
|
||||
+212
-62
@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter(prefix="/achievements", tags=["achievements"])
|
||||
|
||||
# ============ Данные 52 достижений ============
|
||||
# ============ Данные 55 достижений ============
|
||||
ACHIEVEMENTS_DATA = [
|
||||
# ===== Word Search (11) =====
|
||||
{"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",
|
||||
"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",
|
||||
@@ -138,20 +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": "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_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_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_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": "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",
|
||||
@@ -162,8 +158,63 @@ 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},
|
||||
|
||||
{"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": "🧠",
|
||||
"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",
|
||||
@@ -182,29 +233,89 @@ ACHIEVEMENTS_DATA = [
|
||||
{"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎",
|
||||
"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",
|
||||
"type": "quiz_perfect_streak", "value": 10},
|
||||
"type": "quiz_correct_streak", "value": 10},
|
||||
|
||||
{"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥",
|
||||
"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",
|
||||
"type": "quiz_perfect_streak", "value": 20},
|
||||
"type": "quiz_correct_streak", "value": 20},
|
||||
|
||||
{"code": "quiz_speed", "category": "wordquiz", "icon": "⚡",
|
||||
"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",
|
||||
"type": "quiz_speed", "value": 3},
|
||||
"type": "quiz_speed_3", "value": 3},
|
||||
|
||||
{"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀",
|
||||
"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",
|
||||
"type": "quiz_speed", "value": 2},
|
||||
"type": "quiz_speed_2", "value": 2},
|
||||
|
||||
{"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆",
|
||||
"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",
|
||||
"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": "🫧",
|
||||
"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",
|
||||
@@ -230,22 +341,82 @@ ACHIEVEMENTS_DATA = [
|
||||
"desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints",
|
||||
"type": "bubble_no_hints", "value": 1},
|
||||
|
||||
{"code": "bubble_perfect", "category": "bubblewords", "icon": "✨",
|
||||
"name_pl": "Perfekcyjny", "name_ru": "Идеальный", "name_uk": "Ідеальний", "name_en": "Perfect",
|
||||
"desc_pl": "Ukończ poziom z maksymalną punktacją (100)", "desc_ru": "Пройти уровень с максимальным счётом (100)", "desc_uk": "Пройти рівень з максимальним рахунком (100)", "desc_en": "Complete a level with maximum score (100)",
|
||||
"type": "bubble_perfect", "value": 1},
|
||||
{"code": "bubble_streak_25", "category": "bubblewords", "icon": "🔥",
|
||||
"name_pl": "Dwadzieścia pięć z rzędu", "name_ru": "Двадцать пять подряд", "name_uk": "Двадцять п'ять поспіль", "name_en": "Twenty-Five in a Row",
|
||||
"desc_pl": "Ukończ 25 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 25 уровней подряд без подсказок", "desc_uk": "Пройти 25 рівнів поспіль без підказок", "desc_en": "Complete 25 levels in a row without hints",
|
||||
"type": "bubble_streak", "value": 25},
|
||||
|
||||
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
|
||||
"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",
|
||||
"type": "bubble_speed", "value": 45},
|
||||
"type": "bubble_speed_45", "value": 45},
|
||||
|
||||
{"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡",
|
||||
"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",
|
||||
"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_words_1000", "category": "bubblewords", "icon": "📚",
|
||||
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
|
||||
"desc_pl": "Zbierz 1000 słów", "desc_ru": "Собрать 1000 слов", "desc_uk": "Зібрати 1000 слів", "desc_en": "Collect 1000 words",
|
||||
"type": "bubble_words", "value": 1000},
|
||||
|
||||
{"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_speed_10", "category": "bubblewords", "icon": "⚡",
|
||||
"name_pl": "Mgnienie", "name_ru": "Мгновение", "name_uk": "Миттєвість", "name_en": "Blink",
|
||||
"desc_pl": "Ukończ poziom w mniej niż 10 sekund", "desc_ru": "Пройти уровень быстрее 10 секунд", "desc_uk": "Пройти рівень швидше 10 секунд", "desc_en": "Complete a level in under 10 seconds",
|
||||
"type": "bubble_speed_10", "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": "🌟",
|
||||
"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",
|
||||
@@ -291,42 +462,7 @@ ACHIEVEMENTS_DATA = [
|
||||
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
|
||||
"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
|
||||
""", 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")
|
||||
|
||||
|
||||
|
||||
+243
-32
@@ -1,5 +1,6 @@
|
||||
import random
|
||||
import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования
|
||||
import json
|
||||
from fastapi import APIRouter, Request, HTTPException
|
||||
from auth import require_auth
|
||||
from database import get_pool
|
||||
@@ -100,7 +101,7 @@ async def get_next_bubble_level(request: Request):
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
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:
|
||||
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
|
||||
|
||||
# Прогрессия по количеству слов на уровне
|
||||
if current_bubble_level <= 10:
|
||||
num_words = random.choice([3, 4])
|
||||
elif current_bubble_level <= 25:
|
||||
num_words = random.choice([5, 6])
|
||||
else:
|
||||
num_words = random.choice([7, 8])
|
||||
# Количество слов по сложности
|
||||
difficulty = user["difficulty"] if "difficulty" in user.keys() else "medium"
|
||||
num_words = {"easy": 3, "medium": 4, "hard": 5}.get(difficulty, 4)
|
||||
|
||||
# 🔧 ФИКС (30.09.2026): csv_words_source —
|
||||
# источник слов переехал с level_words (старая схема level_id IS NULL)
|
||||
@@ -162,10 +159,172 @@ async def get_next_bubble_level(request: Request):
|
||||
|
||||
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 {
|
||||
"words": result_words,
|
||||
"bubbles": all_parts,
|
||||
"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()
|
||||
words_count = body.get("words_count", 3)
|
||||
completion_time = body.get("completion_time")
|
||||
list_opened = bool(body.get("list_opened", False))
|
||||
wrong_words = int(body.get("wrong_words", 0) or 0)
|
||||
|
||||
pool = await get_pool()
|
||||
@@ -195,39 +353,76 @@ async def complete_bubble_level(request: Request):
|
||||
if not user_exists:
|
||||
raise HTTPException(401, "User not registered")
|
||||
|
||||
current_level = await conn.fetchval(
|
||||
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
|
||||
) or "A1"
|
||||
user = await conn.fetchrow(
|
||||
"SELECT current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||
)
|
||||
current_level = user["current_level"] or "A1"
|
||||
difficulty = user["difficulty"] or "medium"
|
||||
|
||||
# Читаем серверный hints_used
|
||||
hints_used = await conn.fetchval(
|
||||
"SELECT current_hints_used FROM bubble_words_progress WHERE user_id = $1",
|
||||
# Читаем серверные счётчики (не из body)
|
||||
progress = await conn.fetchrow(
|
||||
"SELECT current_hints_used, current_list_opened "
|
||||
"FROM bubble_words_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
)
|
||||
hints_used = (progress["current_hints_used"] if progress else 0) or 0
|
||||
hints_used = min(max(0, hints_used), 3)
|
||||
list_opened = (progress["current_list_opened"] if progress else 0) or 0
|
||||
|
||||
# 🆕 Расчёт звёзд
|
||||
# Старт 5. Штрафы: hints(1) + wrong_words(до 3) + time(1)
|
||||
time_penalty = 1 if (completion_time and completion_time > 60) else 0
|
||||
wrong_penalty = min(max(0, wrong_words), 3)
|
||||
hint_penalty = 1 if hints_used > 0 else 0
|
||||
list_penalty = 1 if list_opened else 0
|
||||
stars = max(1, 5 - time_penalty - wrong_penalty - hint_penalty - list_penalty)
|
||||
# 🔧 НОВОЕ (14.10.2026): очки по формуле филворда.
|
||||
# Hard — фикс 110. Easy/Medium — 100 − 20×hints − 20×list + bonus.
|
||||
if difficulty == "hard":
|
||||
if hints_used > 0 or list_opened:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
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
|
||||
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"]
|
||||
|
||||
# 🔧 НОВОЕ (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("""
|
||||
INSERT INTO bubble_words_progress (user_id, levels_completed, total_score, level, current_hints_used)
|
||||
VALUES ($1, 1, $2, $3, 0)
|
||||
INSERT INTO bubble_words_progress
|
||||
(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
|
||||
SET levels_completed = bubble_words_progress.levels_completed + 1,
|
||||
total_score = bubble_words_progress.total_score + $2,
|
||||
level = $3,
|
||||
current_hints_used = 0
|
||||
""", telegram_id, score, current_level)
|
||||
current_hints_used = 0,
|
||||
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(
|
||||
@@ -241,13 +436,30 @@ async def complete_bubble_level(request: Request):
|
||||
]
|
||||
if hints_used == 0:
|
||||
achievements_to_check.append(("bubble_no_hints", 1))
|
||||
if stars == 5:
|
||||
achievements_to_check.append(("bubble_perfect", 1))
|
||||
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:
|
||||
achievements_to_check.append(("bubble_speed_30", 30))
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): триггеры новых достижений.
|
||||
# bubble_words — всего слов собрано
|
||||
achievements_to_check.append(("bubble_words", words_collected))
|
||||
|
||||
# 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_speed_10 — быстрее 10 сек
|
||||
if completion_time is not None and 0 < completion_time <= 10:
|
||||
achievements_to_check.append(("bubble_speed_10", 10))
|
||||
|
||||
# Достижения — вне транзакции
|
||||
from routers.achievements import check_and_award_achievements
|
||||
new_achievements = []
|
||||
@@ -261,7 +473,6 @@ async def complete_bubble_level(request: Request):
|
||||
"completion_time": completion_time,
|
||||
"new_achievements": new_achievements,
|
||||
# 🆕 XP-поля
|
||||
"stars": xp_result["stars"],
|
||||
"base_points": xp_result["base_points"],
|
||||
"multiplier": xp_result["multiplier"],
|
||||
"points": xp_result["points"],
|
||||
|
||||
+28
-13
@@ -359,7 +359,8 @@ async def complete_level(request: Request):
|
||||
wave_points = 0
|
||||
wave_max_points = 0
|
||||
wave_medal_result = "none"
|
||||
session_number = 1
|
||||
current_wave = 1
|
||||
current_position_in_wave = 1
|
||||
|
||||
async with pool.acquire() as conn:
|
||||
user = await conn.fetchrow(
|
||||
@@ -458,14 +459,28 @@ async def complete_level(request: Request):
|
||||
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
|
||||
# Теперь UPSERT с ON CONFLICT DO UPDATE.
|
||||
# hints_used уже прочитан из БД выше (не доверяем клиенту).
|
||||
# 🆕 (13.10.2026): читаем session_number ДО записи, чтобы
|
||||
# записать wave в user_progress (для подсчёта очков волны).
|
||||
# 🔧 ФИКС (13.10.2026): wave_off_by_one —
|
||||
# session_level_number хранит позицию СЛЕДУЮЩЕГО уровня
|
||||
# (уже увеличенную при выдаче), поэтому модалка волны
|
||||
# срабатывала на 9-м уровне. Читаем current_wave /
|
||||
# current_position_in_wave — позицию именно завершаемого уровня.
|
||||
wave_row = await conn.fetchrow(
|
||||
"SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
|
||||
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
|
||||
telegram_id,
|
||||
)
|
||||
session_number = int(wave_row["session_number"] or 1) if wave_row else 1
|
||||
session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1
|
||||
if wave_row and wave_row["current_wave"] and wave_row["current_position_in_wave"]:
|
||||
current_wave = int(wave_row["current_wave"])
|
||||
current_position_in_wave = int(wave_row["current_position_in_wave"])
|
||||
else:
|
||||
# Fallback для старых записей без current_* полей.
|
||||
global_level = await conn.fetchval(
|
||||
"SELECT global_level_number FROM user_game_progress WHERE user_id = $1",
|
||||
telegram_id,
|
||||
)
|
||||
global_level = int(global_level or 1)
|
||||
from services.waves import wave_for_level, level_in_wave
|
||||
current_wave = wave_for_level(global_level)
|
||||
current_position_in_wave = level_in_wave(global_level)
|
||||
|
||||
await conn.execute("""
|
||||
INSERT INTO user_progress
|
||||
@@ -478,7 +493,7 @@ async def complete_level(request: Request):
|
||||
level = $5,
|
||||
current_streak = 0,
|
||||
wave = $6
|
||||
""", telegram_id, level_id, hints_used, score, level_name, session_number)
|
||||
""", telegram_id, level_id, hints_used, score, level_name, current_wave)
|
||||
|
||||
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
||||
# Обновляем только users.last_completed_level — глобальный.
|
||||
@@ -530,18 +545,18 @@ async def complete_level(request: Request):
|
||||
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
||||
) or 0
|
||||
|
||||
# Пройдено волн = session_number - 1; если только что завершили
|
||||
# Пройдено волн = current_wave - 1; если только что завершили
|
||||
# 10-й уровень волны — волна пройдена (+1).
|
||||
waves_completed = session_number - 1
|
||||
if session_level_number == 10:
|
||||
waves_completed = current_wave - 1
|
||||
if current_position_in_wave == 10:
|
||||
waves_completed += 1
|
||||
|
||||
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||
from services.waves import max_points_for_wave, wave_medal
|
||||
wave_completed = (session_level_number == 10)
|
||||
wave_completed = (current_position_in_wave == 10)
|
||||
wave_points = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2",
|
||||
telegram_id, session_number,
|
||||
telegram_id, current_wave,
|
||||
) or 0
|
||||
wave_max_points = max_points_for_wave()
|
||||
wave_medal_result = wave_medal(wave_points, wave_max_points)
|
||||
@@ -639,7 +654,7 @@ async def complete_level(request: Request):
|
||||
"xp_needed": xp_result["xp_needed"],
|
||||
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||
"wave_completed": wave_completed,
|
||||
"wave_number": session_number,
|
||||
"wave_number": current_wave,
|
||||
"wave_points": wave_points,
|
||||
"wave_max_points": wave_max_points,
|
||||
"wave_medal": wave_medal_result,
|
||||
|
||||
+130
-76
@@ -7,39 +7,6 @@ from database import get_pool
|
||||
router = APIRouter(prefix="/sentences", tags=["sentences"])
|
||||
|
||||
|
||||
@router.get("/{sentence_id}/hint")
|
||||
async def get_sentence_hint(sentence_id: int, request: Request):
|
||||
"""Получить правильное предложение в качестве подсказки (одноразово)"""
|
||||
telegram_id, _ = await require_auth(request)
|
||||
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
row = await conn.fetchrow(
|
||||
"SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id
|
||||
)
|
||||
if not row:
|
||||
raise HTTPException(404, "Sentence not found")
|
||||
|
||||
# 🔧 ФИКС (24.09.2026): sentence_hint_no_limit — лимит 1 раз на предложение.
|
||||
already_used = await conn.fetchval(
|
||||
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
|
||||
telegram_id, sentence_id
|
||||
)
|
||||
if already_used:
|
||||
raise HTTPException(403, "Hint already used for this sentence")
|
||||
|
||||
# Записываем использование
|
||||
await conn.execute("""
|
||||
INSERT INTO sentence_hints_used (user_id, sentence_id)
|
||||
VALUES ($1, $2)
|
||||
ON CONFLICT (user_id, sentence_id) DO NOTHING
|
||||
""", telegram_id, sentence_id)
|
||||
|
||||
return {
|
||||
"sentence_pl": row["sentence_pl"],
|
||||
}
|
||||
|
||||
|
||||
def load_sentences_from_csv(filename):
|
||||
"""Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian)."""
|
||||
sentences = []
|
||||
@@ -65,6 +32,7 @@ async def init_sentences():
|
||||
("B1", "sentences_b1.csv"),
|
||||
]
|
||||
|
||||
offset = 0
|
||||
for level, filename in level_files:
|
||||
sentences = load_sentences_from_csv(filename)
|
||||
for i, s in enumerate(sentences):
|
||||
@@ -74,11 +42,12 @@ async def init_sentences():
|
||||
await conn.execute(
|
||||
"""INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7)
|
||||
ON CONFLICT (level, sentence_number) DO NOTHING""",
|
||||
i + 1, s["sentence_pl"],
|
||||
ON CONFLICT (sentence_number) DO NOTHING""",
|
||||
offset + i + 1, s["sentence_pl"],
|
||||
s["translation_ru"], s["translation_uk"], s["translation_en"],
|
||||
difficulty, level
|
||||
)
|
||||
offset += len(sentences)
|
||||
|
||||
|
||||
def normalize_word_for_display(word: str) -> str:
|
||||
@@ -100,28 +69,34 @@ async def get_next_sentence(request: Request):
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
user = await conn.fetchrow(
|
||||
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id
|
||||
"SELECT app_language, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||
)
|
||||
if not user:
|
||||
raise HTTPException(401, "User not registered")
|
||||
|
||||
lang = user["app_language"] or "pl"
|
||||
current_level = user["current_level"] or "A1"
|
||||
difficulty = user["difficulty"] or "medium"
|
||||
|
||||
# Находим случайное непройденное предложение нужного уровня
|
||||
# Находим случайное непройденное предложение (единый пул)
|
||||
row = await conn.fetchrow("""
|
||||
SELECT s.* FROM sentences s
|
||||
WHERE s.level = $1
|
||||
AND s.id NOT IN (
|
||||
SELECT sentence_id FROM sentence_progress WHERE user_id = $2
|
||||
WHERE s.id NOT IN (
|
||||
SELECT sentence_id FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL
|
||||
)
|
||||
ORDER BY RANDOM()
|
||||
LIMIT 1
|
||||
""", current_level, telegram_id)
|
||||
""", telegram_id)
|
||||
|
||||
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()
|
||||
|
||||
@@ -140,10 +115,64 @@ async def get_next_sentence(request: Request):
|
||||
"correct_words": display_words,
|
||||
"translation": translation,
|
||||
"difficulty": row["difficulty"],
|
||||
"user_difficulty": difficulty,
|
||||
"level": row["level"],
|
||||
}
|
||||
|
||||
|
||||
@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):
|
||||
"""Проверка предложения с защитой от повторного прохождения и выдачей достижений"""
|
||||
@@ -176,7 +205,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
|
||||
)
|
||||
|
||||
@@ -208,36 +237,67 @@ 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)
|
||||
|
||||
# 🔧 НОВОЕ (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(),
|
||||
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
|
||||
@@ -268,6 +328,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)))
|
||||
@@ -287,7 +350,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"],
|
||||
@@ -315,21 +377,14 @@ async def get_sentence_stats(request: Request):
|
||||
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
user = await conn.fetchrow(
|
||||
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
|
||||
)
|
||||
current_level = user["current_level"] if user else "A1"
|
||||
|
||||
total = await conn.fetchval(
|
||||
"SELECT COUNT(*) FROM sentences WHERE level = $1", current_level
|
||||
)
|
||||
total = await conn.fetchval("SELECT COUNT(*) FROM sentences")
|
||||
completed = await conn.fetchval(
|
||||
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2",
|
||||
telegram_id, current_level
|
||||
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
)
|
||||
total_score = await conn.fetchval(
|
||||
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2",
|
||||
telegram_id, current_level
|
||||
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
|
||||
telegram_id
|
||||
)
|
||||
|
||||
return {
|
||||
@@ -338,5 +393,4 @@ async def get_sentence_stats(request: Request):
|
||||
"remaining": total - (completed or 0),
|
||||
"total_score": total_score or 0,
|
||||
"progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0,
|
||||
"level": current_level,
|
||||
}
|
||||
+58
-27
@@ -14,7 +14,7 @@ async def get_next_quiz(request: Request):
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
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:
|
||||
raise HTTPException(401, "User not registered")
|
||||
@@ -22,6 +22,12 @@ async def get_next_quiz(request: Request):
|
||||
lang = user["app_language"] or "pl"
|
||||
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(
|
||||
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
@@ -73,7 +79,7 @@ async def get_next_quiz(request: Request):
|
||||
LIMIT 5
|
||||
""", 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.
|
||||
wrong_words = await conn.fetch("""
|
||||
SELECT word_pl
|
||||
@@ -90,7 +96,7 @@ async def get_next_quiz(request: Request):
|
||||
if wl not in seen:
|
||||
wrong_options.append(w["word_pl"])
|
||||
seen.add(wl)
|
||||
if len(wrong_options) >= 2:
|
||||
if len(wrong_options) >= wrong_count:
|
||||
break
|
||||
|
||||
recent_words = recent_words + [correct_polish] + wrong_options
|
||||
@@ -107,20 +113,14 @@ async def get_next_quiz(request: Request):
|
||||
options = wrong_options + [correct_polish]
|
||||
random.shuffle(options)
|
||||
|
||||
if total_guessed <= 10:
|
||||
difficulty = "easy"
|
||||
elif total_guessed <= 30:
|
||||
difficulty = "medium"
|
||||
elif total_guessed <= 60:
|
||||
difficulty = "hard"
|
||||
else:
|
||||
difficulty = "expert"
|
||||
time_limit = 10 if difficulty == "hard" else None
|
||||
|
||||
return {
|
||||
"correct_polish": correct_polish,
|
||||
"translation": translation,
|
||||
"options": options,
|
||||
"difficulty": difficulty,
|
||||
"time_limit": time_limit,
|
||||
}
|
||||
|
||||
|
||||
@@ -157,6 +157,17 @@ async def check_quiz_answer(request: Request):
|
||||
|
||||
pool = await get_pool()
|
||||
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
|
||||
current_streak = await conn.fetchval(
|
||||
"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",
|
||||
telegram_id
|
||||
) 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:
|
||||
current_streak += 1
|
||||
@@ -183,32 +198,41 @@ async def check_quiz_answer(request: Request):
|
||||
score = 0
|
||||
|
||||
if is_correct:
|
||||
# 🆕 Расчёт звёзд для "Выбери слово"
|
||||
# Старт 5 звёзд. Штрафы:
|
||||
# -1 за каждый неверный (макс 3)
|
||||
# -1 если time > 30 сек
|
||||
time_penalty = 1 if (completion_time and completion_time > 30) else 0
|
||||
wrong_penalty = min(mistakes, 3)
|
||||
stars = max(1, 5 - wrong_penalty - time_penalty)
|
||||
# 🆕 Фиксированные очки по сложности (ChooseWord)
|
||||
if difficulty == "easy":
|
||||
points = max(20, min(60, 60 - 20 * mistakes))
|
||||
elif difficulty == "medium":
|
||||
points = max(20, min(80, 80 - 20 * mistakes))
|
||||
else: # hard
|
||||
points = max(20, min(110, 110 - 20 * mistakes))
|
||||
if completion_time is not None and completion_time > 10:
|
||||
points = 20
|
||||
|
||||
# Начисляем 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"]
|
||||
|
||||
# no_mistakes_streak: +1 если раунд чистый, иначе сброс
|
||||
if mistakes == 0:
|
||||
no_mistakes_streak += 1
|
||||
else:
|
||||
no_mistakes_streak = 0
|
||||
|
||||
# Сбрасываем mistakes + обновляем серию
|
||||
await conn.execute("""
|
||||
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
|
||||
""", telegram_id)
|
||||
|
||||
await conn.execute("""
|
||||
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak)
|
||||
VALUES ($1, 1, $2, $3)
|
||||
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, no_mistakes_streak)
|
||||
VALUES ($1, 1, $2, $3, $4)
|
||||
ON CONFLICT (user_id) DO UPDATE
|
||||
SET words_guessed = word_quiz_progress.words_guessed + 1,
|
||||
total_score = word_quiz_progress.total_score + $2,
|
||||
correct_streak = $3
|
||||
""", telegram_id, score, current_streak)
|
||||
correct_streak = $3,
|
||||
no_mistakes_streak = $4
|
||||
""", telegram_id, score, current_streak, no_mistakes_streak)
|
||||
|
||||
# 🆕 Обновляем best_streak в choose_progress
|
||||
await conn.execute("""
|
||||
@@ -230,12 +254,20 @@ async def check_quiz_answer(request: Request):
|
||||
("quiz_guessed", total_guessed),
|
||||
("total_score", xp_result["total_xp"]),
|
||||
]
|
||||
if current_streak >= 10:
|
||||
achievements_to_check.append(("quiz_perfect_streak", current_streak))
|
||||
if current_streak >= 5:
|
||||
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:
|
||||
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:
|
||||
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:
|
||||
# При 3 ошибках — утешительный XP (10)
|
||||
if mistakes >= 3:
|
||||
@@ -268,7 +300,6 @@ async def check_quiz_answer(request: Request):
|
||||
"correct_streak": current_streak,
|
||||
"new_achievements": new_achievements,
|
||||
# 🆕 XP-поля
|
||||
"stars": xp_result["stars"],
|
||||
"base_points": xp_result["base_points"],
|
||||
"multiplier": xp_result["multiplier"],
|
||||
"points": xp_result["points"],
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Сброс прогресса и достижений пользователя (для теста «как новый юзер»).
|
||||
|
||||
Что делает:
|
||||
- удаляет весь игровой прогресс (филворд, пузыри, угадай слово,
|
||||
предложения, печать, обучение, XP-лог, серии, волны, статистику слов);
|
||||
- удаляет выданные достижения (user_achievements);
|
||||
- обнуляет XP в user_profile (total_xp, weekly_xp);
|
||||
- сбрасывает users.last_completed_level, last_completed_by_level, current_level.
|
||||
|
||||
Что НЕ трогает:
|
||||
- саму учётку (users: telegram_id, device_id, apple_id, source);
|
||||
- настройки (difficulty, app_language);
|
||||
- авторизацию (auth_identities);
|
||||
- поддержку (support_tickets / support_messages).
|
||||
|
||||
Запуск (из папки backend/):
|
||||
python scripts/reset_user_progress.py --telegram-id -1
|
||||
python scripts/reset_user_progress.py --device-id 11111111-2222-3333-4444-555555555555
|
||||
python scripts/reset_user_progress.py --all-pleily
|
||||
python scripts/reset_user_progress.py --telegram-id -1 --yes # без подтверждения
|
||||
|
||||
Без --yes скрипт спросит подтверждение.
|
||||
"""
|
||||
import argparse
|
||||
import asyncio
|
||||
import logging
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent))
|
||||
|
||||
from database import get_pool
|
||||
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Таблицы, где user_id = telegram_id. Чистим по каждому найденному юзеру.
|
||||
USER_TABLES = [
|
||||
"user_progress",
|
||||
"sentence_progress",
|
||||
"typing_progress",
|
||||
"user_achievements",
|
||||
"daily_logins",
|
||||
"word_quiz_progress",
|
||||
"bubble_words_progress",
|
||||
"sentence_stats",
|
||||
"choose_progress",
|
||||
"user_seen_levels",
|
||||
"user_game_progress",
|
||||
"wave_results",
|
||||
"user_seen_bubble_levels",
|
||||
"user_word_stats",
|
||||
"xp_log",
|
||||
"typing_hints_used",
|
||||
"chat_history",
|
||||
"chat_usage",
|
||||
"user_learning_answers",
|
||||
"user_learning_answers_archive",
|
||||
"user_lesson_progress",
|
||||
"user_topic_progress",
|
||||
"user_skill_mastery",
|
||||
"learning_sessions",
|
||||
"ai_user_context",
|
||||
"teacher_chat_history",
|
||||
"teacher_ai_usage",
|
||||
]
|
||||
|
||||
|
||||
async def resolve_user_ids(conn, telegram_id, device_id, all_pleily):
|
||||
"""Возвращает список telegram_id, которых нужно сбросить."""
|
||||
if telegram_id is not None:
|
||||
row = await conn.fetchrow(
|
||||
"SELECT telegram_id FROM users WHERE telegram_id = $1", telegram_id
|
||||
)
|
||||
if not row:
|
||||
logger.error(f"❌ Пользователь с telegram_id={telegram_id} не найден")
|
||||
return []
|
||||
return [row["telegram_id"]]
|
||||
|
||||
if device_id is not None:
|
||||
row = await conn.fetchrow(
|
||||
"SELECT telegram_id FROM users WHERE device_id = $1::uuid", device_id
|
||||
)
|
||||
if not row:
|
||||
logger.error(f"❌ Пользователь с device_id={device_id} не найден")
|
||||
return []
|
||||
return [row["telegram_id"]]
|
||||
|
||||
if all_pleily:
|
||||
rows = await conn.fetch(
|
||||
"SELECT telegram_id FROM users WHERE telegram_id < 0 OR source = 'pleily_device'"
|
||||
)
|
||||
return [r["telegram_id"] for r in rows]
|
||||
|
||||
return []
|
||||
|
||||
|
||||
async def reset_user(conn, user_id: int) -> None:
|
||||
"""Чистит прогресс одного пользователя в одной транзакции."""
|
||||
async with conn.transaction():
|
||||
for table in USER_TABLES:
|
||||
await conn.execute(f"DELETE FROM {table} WHERE user_id = $1", user_id)
|
||||
|
||||
# Обнуляем XP-профиль (строку оставляем, чтобы не ломать FK).
|
||||
await conn.execute(
|
||||
"""
|
||||
UPDATE user_profile
|
||||
SET total_xp = 0, weekly_xp = 0, updated_at = NOW()
|
||||
WHERE user_id = $1
|
||||
""",
|
||||
user_id,
|
||||
)
|
||||
|
||||
# Сбрасываем прогресс уровней в users.
|
||||
await conn.execute(
|
||||
"""
|
||||
UPDATE users
|
||||
SET last_completed_level = 0,
|
||||
last_completed_by_level = '{}'::jsonb,
|
||||
current_level = 'A1'
|
||||
WHERE telegram_id = $1
|
||||
""",
|
||||
user_id,
|
||||
)
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
parser = argparse.ArgumentParser(description="Сброс прогресса и достижений пользователя")
|
||||
group = parser.add_mutually_exclusive_group(required=True)
|
||||
group.add_argument("--telegram-id", type=int, help="telegram_id юзера (у Pleily отрицательный)")
|
||||
group.add_argument("--device-id", type=str, help="UUID устройства (Pleily)")
|
||||
group.add_argument("--all-pleily", action="store_true", help="сбросить ВСЕХ Pleily-юзеров")
|
||||
parser.add_argument("--yes", action="store_true", help="не спрашивать подтверждение")
|
||||
args = parser.parse_args()
|
||||
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
user_ids = await resolve_user_ids(conn, args.telegram_id, args.device_id, args.all_pleily)
|
||||
|
||||
if not user_ids:
|
||||
logger.warning("⚠️ Некого сбрасывать — выхожу")
|
||||
return
|
||||
|
||||
logger.info(f"Найдено пользователей: {len(user_ids)} → {user_ids}")
|
||||
|
||||
if not args.yes:
|
||||
answer = input(
|
||||
f"Сбросить прогресс и достижения для {len(user_ids)} юзер(ов)? [y/N]: "
|
||||
).strip().lower()
|
||||
if answer not in ("y", "yes", "д", "да"):
|
||||
logger.info("Отменено.")
|
||||
return
|
||||
|
||||
for uid in user_ids:
|
||||
await reset_user(conn, uid)
|
||||
logger.info(f"✅ Сброшено: telegram_id={uid}")
|
||||
|
||||
logger.info("🎉 Готово! Можно тестировать как новый пользователь.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(main())
|
||||
+69
-28
@@ -1966,44 +1966,85 @@ async def test_sentences_stats(smoke_user):
|
||||
assert passed
|
||||
|
||||
|
||||
async def test_sentences_hint(smoke_user, smoke_conn):
|
||||
"""GET /sentences/{id}/hint → sentence_pl, лимит 1 раз."""
|
||||
async def test_sentences_show_answer_medium(smoke_user, smoke_conn):
|
||||
"""POST /sentences/show-answer — Medium: лимит 2 (200, 200, 403)."""
|
||||
client = smoke_user
|
||||
|
||||
# Берём предложение, которое юзер ещё НЕ проходил и НЕ брал подсказку
|
||||
sentence_id = await smoke_conn.fetchval("""
|
||||
SELECT id FROM sentences
|
||||
WHERE id NOT IN (
|
||||
SELECT sentence_id FROM sentence_hints_used WHERE user_id = $1
|
||||
)
|
||||
ORDER BY id LIMIT 1
|
||||
""", SMOKE_USER_ID)
|
||||
await smoke_conn.execute(
|
||||
"UPDATE users SET difficulty = 'medium' WHERE telegram_id = $1", SMOKE_USER_ID
|
||||
)
|
||||
|
||||
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
|
||||
if not sentence_id:
|
||||
pytest.skip("Нет предложений для hint-теста")
|
||||
pytest.skip("Нет предложений для show-answer теста")
|
||||
return
|
||||
|
||||
# 1. Первый запрос — 200
|
||||
resp1 = await client.get(f"/sentences/{sentence_id}/hint")
|
||||
ok1 = resp1.status_code == 200
|
||||
body1 = resp1.json() if ok1 else {}
|
||||
has_sentence = bool(body1.get("sentence_pl"))
|
||||
|
||||
# 2. Проверка в БД
|
||||
recorded = await smoke_conn.fetchval(
|
||||
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
|
||||
# Чистим list_opened, чтобы начать с 0
|
||||
await smoke_conn.execute(
|
||||
"DELETE FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
|
||||
SMOKE_USER_ID, sentence_id,
|
||||
) is not None
|
||||
)
|
||||
|
||||
# 3. Второй запрос — 403 (лимит)
|
||||
resp2 = await client.get(f"/sentences/{sentence_id}/hint")
|
||||
limit_ok = resp2.status_code == 403
|
||||
resp1 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
|
||||
resp2 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
|
||||
resp3 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
|
||||
|
||||
passed = ok1 and has_sentence and recorded and limit_ok
|
||||
passed = resp1.status_code == 200 and resp2.status_code == 200 and resp3.status_code == 403
|
||||
RESULTS.append(ScenarioResult(
|
||||
"sentences_hint", "sentences", passed,
|
||||
f"first={resp1.status_code}, recorded={recorded}, second={resp2.status_code} (ожидали 403)",
|
||||
{"first_status": resp1.status_code, "recorded": recorded, "second_status": resp2.status_code},
|
||||
"sentences_show_answer_medium", "sentences", passed,
|
||||
f"medium: 1={resp1.status_code}, 2={resp2.status_code}, 3={resp3.status_code} (ожидали 200/200/403)",
|
||||
{"first": resp1.status_code, "second": resp2.status_code, "third": resp3.status_code},
|
||||
))
|
||||
assert passed
|
||||
|
||||
|
||||
async def test_sentences_show_answer_hard(smoke_user, smoke_conn):
|
||||
"""POST /sentences/show-answer — Hard: сразу 403."""
|
||||
client = smoke_user
|
||||
|
||||
await smoke_conn.execute(
|
||||
"UPDATE users SET difficulty = 'hard' WHERE telegram_id = $1", SMOKE_USER_ID
|
||||
)
|
||||
|
||||
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
|
||||
if not sentence_id:
|
||||
pytest.skip("Нет предложений для show-answer теста")
|
||||
return
|
||||
|
||||
resp = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
|
||||
|
||||
passed = resp.status_code == 403
|
||||
RESULTS.append(ScenarioResult(
|
||||
"sentences_show_answer_hard", "sentences", passed,
|
||||
f"hard: status={resp.status_code} (ожидали 403)",
|
||||
{"status": resp.status_code},
|
||||
))
|
||||
assert passed
|
||||
|
||||
|
||||
async def test_sentences_show_answer_easy(smoke_user, smoke_conn):
|
||||
"""POST /sentences/show-answer — Easy: без лимита (несколько 200)."""
|
||||
client = smoke_user
|
||||
|
||||
await smoke_conn.execute(
|
||||
"UPDATE users SET difficulty = 'easy' WHERE telegram_id = $1", SMOKE_USER_ID
|
||||
)
|
||||
|
||||
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
|
||||
if not sentence_id:
|
||||
pytest.skip("Нет предложений для show-answer теста")
|
||||
return
|
||||
|
||||
statuses = []
|
||||
for _ in range(3):
|
||||
r = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
|
||||
statuses.append(r.status_code)
|
||||
|
||||
passed = all(s == 200 for s in statuses)
|
||||
RESULTS.append(ScenarioResult(
|
||||
"sentences_show_answer_easy", "sentences", passed,
|
||||
f"easy: statuses={statuses} (ожидали все 200)",
|
||||
{"statuses": statuses},
|
||||
))
|
||||
assert passed
|
||||
|
||||
|
||||
Reference in New Issue
Block a user