3 Commits
+17 -3
View File
@@ -229,8 +229,17 @@ async def first_part_hint(request: Request):
if hints_used >= 3: if hints_used >= 3:
raise HTTPException(400, "All hints used") raise HTTPException(400, "All hints used")
level_words = progress["current_level_words"] or [] raw = progress["current_level_words"]
hinted = set(progress["hinted_words"] or []) 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 = [ candidates = [
@@ -298,7 +307,12 @@ async def show_words(request: Request):
if difficulty == "medium" and list_opened >= 1: if difficulty == "medium" and list_opened >= 1:
raise HTTPException(400, "Word list already used on Medium difficulty") raise HTTPException(400, "Word list already used on Medium difficulty")
level_words = progress["current_level_words"] or [] raw = progress["current_level_words"]
if isinstance(raw, str):
level_words = json.loads(raw) if raw else []
else:
level_words = raw or []
words = [ words = [
{"word_pl": w.get("word_pl"), "translation": w.get("translation")} {"word_pl": w.get("word_pl"), "translation": w.get("translation")}
for w in level_words for w in level_words