Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
938d674b09 | ||
|
|
556c11fc95 | ||
|
|
aa7679c49b | ||
|
|
9db00df88f | ||
|
|
4333aa62a6 | ||
|
|
bd743e4c48 | ||
|
|
f83fcc0e1c | ||
|
|
78d40364bf | ||
|
|
20b1cdc464 | ||
|
|
26442db954 | ||
|
|
e3bc3e8456 | ||
|
|
a6fe755fdb | ||
|
|
959f789f24 | ||
|
|
d181e43ee3 | ||
|
|
6f89336a02 | ||
|
|
f78a1fa19f | ||
|
|
2b5ef446c1 | ||
|
|
50c02b7707 | ||
|
|
6e02303ea8 | ||
|
|
22e4eed3f5 | ||
|
|
5e2de6f7e4 | ||
|
|
2dedec5972 | ||
|
|
8b98655716 | ||
|
|
da7182fb6b | ||
|
|
b62311d3ed | ||
|
|
6f341a7f33 | ||
|
|
981e65e57c | ||
|
|
9c975dde79 | ||
|
|
df3d32ecd5 | ||
|
|
437921d9dd | ||
|
|
bcc01a0fe8 | ||
|
|
8338d6b3c8 | ||
|
|
12c6bbca51 | ||
|
|
794daad69c | ||
|
|
5e9cd0c901 | ||
|
|
ea297b2179 | ||
|
|
791adfeee9 | ||
|
|
0a4c0c5d23 |
+26
@@ -229,6 +229,21 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added current_streak column to user_progress")
|
logger.info("Added current_streak column to user_progress")
|
||||||
|
|
||||||
|
# ============ Авто-миграция: добавляем wave в user_progress ============
|
||||||
|
# 🔧 НОВОЕ (13.10.2026): wave — номер волны, к которой относится
|
||||||
|
# пройденный уровень. Нужен для подсчёта wave_points (сумма очков
|
||||||
|
# за 10 уровней волны) в модалке итогов волны.
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'user_progress' AND column_name = 'wave'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE user_progress
|
||||||
|
ADD COLUMN wave INTEGER
|
||||||
|
""")
|
||||||
|
logger.info("Added wave column to user_progress")
|
||||||
|
|
||||||
# ============ sentences ============
|
# ============ sentences ============
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE TABLE IF NOT EXISTS sentences (
|
CREATE TABLE IF NOT EXISTS sentences (
|
||||||
@@ -1299,6 +1314,17 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added apple_id column to users (Pleily)")
|
logger.info("Added apple_id column to users (Pleily)")
|
||||||
|
|
||||||
|
# difficulty
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'users' AND column_name = 'difficulty'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE users ADD COLUMN difficulty TEXT DEFAULT 'medium'
|
||||||
|
""")
|
||||||
|
logger.info("Added difficulty column to users (Pleily)")
|
||||||
|
|
||||||
# app_user_id_seq — sequence для отрицательных user_id
|
# app_user_id_seq — sequence для отрицательных user_id
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE SEQUENCE IF NOT EXISTS app_user_id_seq
|
CREATE SEQUENCE IF NOT EXISTS app_user_id_seq
|
||||||
|
|||||||
@@ -523,6 +523,7 @@
|
|||||||
| last_completed_level | integer | YES | 0 |
|
| last_completed_level | integer | YES | 0 |
|
||||||
| id | integer | NO | nextval('users_id_seq'::regclass) |
|
| id | integer | NO | nextval('users_id_seq'::regclass) |
|
||||||
| current_level | text | YES | 'A1'::text |
|
| current_level | text | YES | 'A1'::text |
|
||||||
|
| difficulty | text | YES | 'medium'::text |
|
||||||
|
|
||||||
## voice_usage
|
## voice_usage
|
||||||
|
|
||||||
|
|||||||
+60
-31
@@ -73,7 +73,7 @@ async def get_level(request: Request, level_number: int):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
user = await conn.fetchrow(
|
||||||
"SELECT app_language, current_level, last_completed_level, last_completed_by_level FROM users WHERE telegram_id = $1", telegram_id
|
"SELECT app_language, current_level, last_completed_level, last_completed_by_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
@@ -208,6 +208,7 @@ async def get_level(request: Request, level_number: int):
|
|||||||
# 🆕 (10.10.2026): волна и позиция в волне.
|
# 🆕 (10.10.2026): волна и позиция в волне.
|
||||||
"wave": wave,
|
"wave": wave,
|
||||||
"position_in_wave": pos_in_wave,
|
"position_in_wave": pos_in_wave,
|
||||||
|
"difficulty": user["difficulty"] or "medium",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -353,15 +354,23 @@ async def complete_level(request: Request):
|
|||||||
fast_streak = 0
|
fast_streak = 0
|
||||||
no_hints_streak = 0
|
no_hints_streak = 0
|
||||||
words_found = 0
|
words_found = 0
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
wave_completed = False
|
||||||
|
wave_points = 0
|
||||||
|
wave_max_points = 0
|
||||||
|
wave_medal_result = "none"
|
||||||
|
session_number = 1
|
||||||
|
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
user = await conn.fetchrow(
|
||||||
"SELECT id, telegram_id, last_completed_level, current_level FROM users WHERE telegram_id = $1",
|
"SELECT id, telegram_id, last_completed_level, current_level, difficulty FROM users WHERE telegram_id = $1",
|
||||||
telegram_id
|
telegram_id
|
||||||
)
|
)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
|
||||||
level = await conn.fetchrow(
|
level = await conn.fetchrow(
|
||||||
"SELECT id, level_number, grid_size, level FROM levels WHERE id = $1", level_id
|
"SELECT id, level_number, grid_size, level FROM levels WHERE id = $1", level_id
|
||||||
)
|
)
|
||||||
@@ -416,29 +425,31 @@ async def complete_level(request: Request):
|
|||||||
hints_used = min(max(0, hints_used), 3)
|
hints_used = min(max(0, hints_used), 3)
|
||||||
|
|
||||||
# 🆕 Штрафы (филворд):
|
# 🆕 Штрафы (филворд):
|
||||||
# -1 за открытие списка слов (один раз за уровень)
|
# -20 за открытие списка слов (один раз за уровень)
|
||||||
# -1 за использование подсказки (один раз за уровень)
|
# -20 за каждую подсказку
|
||||||
# -1 за превышение времени
|
|
||||||
list_opened = bool(body.get("list_opened", False))
|
list_opened = bool(body.get("list_opened", False))
|
||||||
|
|
||||||
# Лимит времени по размеру сетки
|
# 🔧 НОВОЕ (13.10.2026): на Hard подсказки и список слов недоступны.
|
||||||
grid_size = level["grid_size"]
|
if difficulty == "hard" and (hints_used > 0 or list_opened):
|
||||||
time_limits = {5: 45, 6: 60, 7: 90, 8: 120}
|
raise HTTPException(
|
||||||
time_limit = time_limits.get(grid_size, 60)
|
status_code=400,
|
||||||
|
detail="Hints and word list are disabled on Hard difficulty"
|
||||||
|
)
|
||||||
|
|
||||||
completion_time_val = completion_time or 0
|
# Очки в зависимости от сложности
|
||||||
time_penalty = 1 if (completion_time_val > time_limit) else 0
|
if difficulty == "hard":
|
||||||
hint_penalty = 1 if hints_used > 0 else 0
|
# Hard: фикс 110 (без подсказок и списка)
|
||||||
list_penalty = 1 if list_opened else 0
|
points = 110
|
||||||
|
else:
|
||||||
stars = max(
|
# Easy / Medium
|
||||||
1,
|
bonus = 10 if hints_used == 0 else 0
|
||||||
5 - time_penalty - hint_penalty - list_penalty
|
penalty_hints = 20 * hints_used
|
||||||
)
|
penalty_list = 0 if difficulty == "easy" else 20 * (1 if list_opened else 0)
|
||||||
|
points = max(20, min(110, 100 - penalty_hints - penalty_list + bonus))
|
||||||
|
|
||||||
# Начисляем XP через единую функцию
|
# Начисляем XP через единую функцию
|
||||||
from services.xp import award_xp
|
from services.xp import award_xp
|
||||||
xp_result = await award_xp(conn, telegram_id, "wordsearch", stars)
|
xp_result = await award_xp(conn, telegram_id, "wordsearch", points)
|
||||||
|
|
||||||
score = xp_result["points"] # для обратной совместимости
|
score = xp_result["points"] # для обратной совместимости
|
||||||
|
|
||||||
@@ -447,17 +458,27 @@ async def complete_level(request: Request):
|
|||||||
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
|
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
|
||||||
# Теперь UPSERT с ON CONFLICT DO UPDATE.
|
# Теперь UPSERT с ON CONFLICT DO UPDATE.
|
||||||
# hints_used уже прочитан из БД выше (не доверяем клиенту).
|
# hints_used уже прочитан из БД выше (не доверяем клиенту).
|
||||||
|
# 🆕 (13.10.2026): читаем session_number ДО записи, чтобы
|
||||||
|
# записать wave в user_progress (для подсчёта очков волны).
|
||||||
|
wave_row = await conn.fetchrow(
|
||||||
|
"SELECT session_number, session_level_number 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
|
||||||
|
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
INSERT INTO user_progress
|
INSERT INTO user_progress
|
||||||
(user_id, level_id, completed_at, hints_used, score, level, current_streak)
|
(user_id, level_id, completed_at, hints_used, score, level, current_streak, wave)
|
||||||
VALUES ($1, $2, NOW(), $3, $4, $5, 0)
|
VALUES ($1, $2, NOW(), $3, $4, $5, 0, $6)
|
||||||
ON CONFLICT (user_id, level_id) DO UPDATE
|
ON CONFLICT (user_id, level_id) DO UPDATE
|
||||||
SET completed_at = NOW(),
|
SET completed_at = NOW(),
|
||||||
hints_used = $3,
|
hints_used = $3,
|
||||||
score = $4,
|
score = $4,
|
||||||
level = $5,
|
level = $5,
|
||||||
current_streak = 0
|
current_streak = 0,
|
||||||
""", telegram_id, level_id, hints_used, score, level_name)
|
wave = $6
|
||||||
|
""", telegram_id, level_id, hints_used, score, level_name, session_number)
|
||||||
|
|
||||||
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
||||||
# Обновляем только users.last_completed_level — глобальный.
|
# Обновляем только users.last_completed_level — глобальный.
|
||||||
@@ -509,19 +530,22 @@ async def complete_level(request: Request):
|
|||||||
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
||||||
) or 0
|
) or 0
|
||||||
|
|
||||||
wave_row = await conn.fetchrow(
|
|
||||||
"SELECT session_number, session_level_number 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
|
|
||||||
|
|
||||||
# Пройдено волн = session_number - 1; если только что завершили
|
# Пройдено волн = session_number - 1; если только что завершили
|
||||||
# 10-й уровень волны — волна пройдена (+1).
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
waves_completed = session_number - 1
|
waves_completed = session_number - 1
|
||||||
if session_level_number == 10:
|
if session_level_number == 10:
|
||||||
waves_completed += 1
|
waves_completed += 1
|
||||||
|
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
from services.waves import max_points_for_wave, wave_medal
|
||||||
|
wave_completed = (session_level_number == 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,
|
||||||
|
) or 0
|
||||||
|
wave_max_points = max_points_for_wave()
|
||||||
|
wave_medal_result = wave_medal(wave_points, wave_max_points)
|
||||||
|
|
||||||
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
|
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
|
||||||
wordsearch_xp = total_score
|
wordsearch_xp = total_score
|
||||||
|
|
||||||
@@ -603,7 +627,6 @@ async def complete_level(request: Request):
|
|||||||
"already_completed": False,
|
"already_completed": False,
|
||||||
"new_achievements": new_achievements,
|
"new_achievements": new_achievements,
|
||||||
# 🆕 XP-поля
|
# 🆕 XP-поля
|
||||||
"stars": xp_result["stars"],
|
|
||||||
"base_points": xp_result["base_points"],
|
"base_points": xp_result["base_points"],
|
||||||
"multiplier": xp_result["multiplier"],
|
"multiplier": xp_result["multiplier"],
|
||||||
"points": xp_result["points"],
|
"points": xp_result["points"],
|
||||||
@@ -614,6 +637,12 @@ async def complete_level(request: Request):
|
|||||||
"rank_key": xp_result["rank_key"],
|
"rank_key": xp_result["rank_key"],
|
||||||
"xp_in_level": xp_result["xp_in_level"],
|
"xp_in_level": xp_result["xp_in_level"],
|
||||||
"xp_needed": xp_result["xp_needed"],
|
"xp_needed": xp_result["xp_needed"],
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
"wave_completed": wave_completed,
|
||||||
|
"wave_number": session_number,
|
||||||
|
"wave_points": wave_points,
|
||||||
|
"wave_max_points": wave_max_points,
|
||||||
|
"wave_medal": wave_medal_result,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -76,6 +76,26 @@ async def set_language(request: Request):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/set-difficulty")
|
||||||
|
async def set_difficulty(request: Request):
|
||||||
|
"""Устанавливает уровень сложности (easy/medium/hard)."""
|
||||||
|
user_id, _ = await require_auth(request)
|
||||||
|
body = await request.json()
|
||||||
|
difficulty = body.get("difficulty", "medium")
|
||||||
|
|
||||||
|
if difficulty not in {"easy", "medium", "hard"}:
|
||||||
|
raise HTTPException(400, "Unsupported difficulty")
|
||||||
|
|
||||||
|
pool = await get_pool()
|
||||||
|
async with pool.acquire() as conn:
|
||||||
|
await conn.execute(
|
||||||
|
"UPDATE users SET difficulty = $1 WHERE telegram_id = $2",
|
||||||
|
difficulty, user_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {"status": "ok", "difficulty": difficulty}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/set-level")
|
@router.post("/set-level")
|
||||||
async def set_level(request: Request):
|
async def set_level(request: Request):
|
||||||
"""Устанавливает текущий уровень пользователя (A1, A2, B1, B2, C1, C2)"""
|
"""Устанавливает текущий уровень пользователя (A1, A2, B1, B2, C1, C2)"""
|
||||||
|
|||||||
+9
-13
@@ -45,22 +45,18 @@ def grid_size_for(global_level: int) -> int:
|
|||||||
return sizes[0] if pos <= HALF_WAVE else sizes[1]
|
return sizes[0] if pos <= HALF_WAVE else sizes[1]
|
||||||
|
|
||||||
|
|
||||||
def max_stars_for_wave() -> int:
|
def max_points_for_wave() -> int:
|
||||||
"""Максимум звёзд за волну (10 уровней × 5 звёзд)."""
|
"""Максимум очков за волну: 10 уровней × 110 = 1100."""
|
||||||
return WAVE_SIZE * 5
|
return 10 * 110
|
||||||
|
|
||||||
|
|
||||||
def wave_medal(stars_earned: int) -> str:
|
def wave_medal(points: int, max_points: int) -> str:
|
||||||
"""
|
"""Медаль за волну: gold ≥90%, silver ≥70%, bronze ≥50%, иначе none."""
|
||||||
Медаль волны по доле звёзд.
|
pct = 100 * points / max_points if max_points > 0 else 0
|
||||||
Пороги: gold >= 90%, silver >= 70%, bronze >= 50%, else 'none'.
|
if pct >= 90:
|
||||||
"""
|
|
||||||
total = max_stars_for_wave()
|
|
||||||
pct = stars_earned / total if total > 0 else 0
|
|
||||||
if pct >= 0.90:
|
|
||||||
return "gold"
|
return "gold"
|
||||||
if pct >= 0.70:
|
if pct >= 70:
|
||||||
return "silver"
|
return "silver"
|
||||||
if pct >= 0.50:
|
if pct >= 50:
|
||||||
return "bronze"
|
return "bronze"
|
||||||
return "none"
|
return "none"
|
||||||
|
|||||||
+11
-24
@@ -35,15 +35,6 @@ GAMES = ["wordsearch", "choose", "sentence", "bubbles"]
|
|||||||
# Множитель игры дня
|
# Множитель игры дня
|
||||||
FEATURED_MULTIPLIER = 1.5
|
FEATURED_MULTIPLIER = 1.5
|
||||||
|
|
||||||
# Базовая ставка: 1 звезда = 20 XP
|
|
||||||
POINTS_PER_STAR = 20
|
|
||||||
|
|
||||||
# Максимум звёзд за уровень
|
|
||||||
MAX_STARS = 5
|
|
||||||
|
|
||||||
# Минимум звёзд за пройденный уровень
|
|
||||||
MIN_STARS = 1
|
|
||||||
|
|
||||||
# Коэффициенты баланса (настроить после первых 1000 сессий)
|
# Коэффициенты баланса (настроить после первых 1000 сессий)
|
||||||
# Применяются к base_points ДО множителя игры дня.
|
# Применяются к base_points ДО множителя игры дня.
|
||||||
GAME_XP_COEF: dict[str, float] = {
|
GAME_XP_COEF: dict[str, float] = {
|
||||||
@@ -192,7 +183,7 @@ async def award_xp(
|
|||||||
conn,
|
conn,
|
||||||
user_id: int,
|
user_id: int,
|
||||||
game: str,
|
game: str,
|
||||||
stars: int,
|
points: int,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
Единая функция начисления опыта.
|
Единая функция начисления опыта.
|
||||||
@@ -201,11 +192,10 @@ async def award_xp(
|
|||||||
conn: asyncpg connection (уже acquired)
|
conn: asyncpg connection (уже acquired)
|
||||||
user_id: telegram_id (может быть отрицательным для Pleily)
|
user_id: telegram_id (может быть отрицательным для Pleily)
|
||||||
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
|
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
|
||||||
stars: 1..5
|
points: готовые очки за уровень (20–110), формула считается до вызова
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
{
|
{
|
||||||
"stars": int,
|
|
||||||
"base_points": int,
|
"base_points": int,
|
||||||
"multiplier": float,
|
"multiplier": float,
|
||||||
"points": int,
|
"points": int,
|
||||||
@@ -219,18 +209,16 @@ async def award_xp(
|
|||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
# 1. Валидация
|
# 1. Валидация
|
||||||
stars = max(MIN_STARS, min(MAX_STARS, int(stars)))
|
|
||||||
if game not in GAME_XP_COEF:
|
if game not in GAME_XP_COEF:
|
||||||
raise ValueError(f"Unknown game: {game}")
|
raise ValueError(f"Unknown game: {game}")
|
||||||
|
|
||||||
# 2. База
|
# 2. База с коэффициентом игры (для баланса)
|
||||||
base = stars * POINTS_PER_STAR
|
base_points = int(round(points * GAME_XP_COEF.get(game, 1.0)))
|
||||||
base = int(round(base * GAME_XP_COEF.get(game, 1.0)))
|
|
||||||
|
|
||||||
# 3. Множитель игры дня
|
# 3. Множитель игры дня
|
||||||
is_featured = (game == featured_game())
|
is_featured = (game == featured_game())
|
||||||
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
|
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
|
||||||
points = int(round(base * multiplier))
|
final_points = int(round(base_points * multiplier))
|
||||||
|
|
||||||
# 4. Читаем текущий total_xp
|
# 4. Читаем текущий total_xp
|
||||||
row = await conn.fetchrow(
|
row = await conn.fetchrow(
|
||||||
@@ -259,11 +247,11 @@ async def award_xp(
|
|||||||
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
|
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6)
|
VALUES ($1, $2, $3, $4, $5, $6)
|
||||||
""",
|
""",
|
||||||
user_id, game, stars, base, multiplier, points,
|
user_id, game, 0, base_points, multiplier, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 6. Обновляем user_profile
|
# 6. Обновляем user_profile
|
||||||
new_total = old_total + points
|
new_total = old_total + final_points
|
||||||
await conn.execute(
|
await conn.execute(
|
||||||
"""
|
"""
|
||||||
UPDATE user_profile
|
UPDATE user_profile
|
||||||
@@ -272,7 +260,7 @@ async def award_xp(
|
|||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
WHERE user_id = $1
|
WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
user_id, points,
|
user_id, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 7. Считаем новый уровень
|
# 7. Считаем новый уровень
|
||||||
@@ -287,14 +275,13 @@ async def award_xp(
|
|||||||
}
|
}
|
||||||
logger.info(
|
logger.info(
|
||||||
"[xp] user=%s level_up %s → %s (%s), +%s xp",
|
"[xp] user=%s level_up %s → %s (%s), +%s xp",
|
||||||
user_id, old_level, new_level, rank_key, points,
|
user_id, old_level, new_level, rank_key, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"stars": stars,
|
"base_points": base_points,
|
||||||
"base_points": base,
|
|
||||||
"multiplier": multiplier,
|
"multiplier": multiplier,
|
||||||
"points": points,
|
"points": final_points,
|
||||||
"featured": is_featured,
|
"featured": is_featured,
|
||||||
"level_up": level_up,
|
"level_up": level_up,
|
||||||
"total_xp": new_total,
|
"total_xp": new_total,
|
||||||
|
|||||||
Reference in New Issue
Block a user