Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -2823,8 +2823,12 @@ async def cmd_settings(update: Update, context: ContextTypes.DEFAULT_TYPE):
runtime = _ACTIVE_RUNTIME.get()
product = runtime.store.product_profile(runtime.user_id)
try:
product.update(runtime.store.get_mirror_preferences(runtime.user_id))
product["mirror_mode"] = product.pop("mode")
preferences = runtime.store.get_mirror_preferences(runtime.user_id)
product.update({
"mirror_mode": preferences["mode"],
"mirror_depth": preferences["depth"],
"mirror_level": preferences["level"],
})
except (AttributeError, TypeError, ValueError):
pass
locale = interface_locale_for_update(update)
Expand Down Expand Up @@ -3145,8 +3149,12 @@ async def start_menu_cb(update: Update, context: ContextTypes.DEFAULT_TYPE):
runtime = _ACTIVE_RUNTIME.get()
product = runtime.store.product_profile(runtime.user_id)
try:
product.update(runtime.store.get_mirror_preferences(runtime.user_id))
product["mirror_mode"] = product.pop("mode")
preferences = runtime.store.get_mirror_preferences(runtime.user_id)
product.update({
"mirror_mode": preferences["mode"],
"mirror_depth": preferences["depth"],
"mirror_level": preferences["level"],
})
except (AttributeError, TypeError, ValueError):
pass
mirror_policy = AdminStore(runtime.store).get_mirror_control_plane()
Expand Down Expand Up @@ -3301,8 +3309,12 @@ async def settings_cb(update: Update, context: ContextTypes.DEFAULT_TYPE):
translate("settings_unavailable", locale), show_alert=True
)
return
product.update(runtime.store.get_mirror_preferences(runtime.user_id))
product["mirror_mode"] = product.pop("mode")
preferences = runtime.store.get_mirror_preferences(runtime.user_id)
product.update({
"mirror_mode": preferences["mode"],
"mirror_depth": preferences["depth"],
"mirror_level": preferences["level"],
})
await query.edit_message_text(
settings_text(current, product, locale=locale, section=section),
reply_markup=settings_keyboard(
Expand Down
12 changes: 12 additions & 0 deletions tests/test_telegram_settings_navigation_e2e_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ async def test_saved_choices_remain_in_their_matching_sections(self):
},
)

async def test_selected_tutor_level_moves_checkmark_from_auto_to_b1(self):
query = await self.invoke_settings("settings:mirror-level:b1")
keyboard = query.edit_message_text.await_args.kwargs["reply_markup"]

checked_callbacks = {
button.callback_data
for row in keyboard.inline_keyboard
for button in row
if button.text.endswith(" ✓")
}
self.assertEqual(checked_callbacks, {"settings:mirror-level:b1"})

async def test_language_choice_is_handled_in_settings_and_stays_in_section(self):
pack = bot.switchable_packs()[0]
update, query = self.update_for(f"settings:language:{pack.pack_id}")
Expand Down
Loading