fix(start): keep welcome before menu after channel verify
This commit is contained in:
@@ -564,6 +564,14 @@ async def verify_channel_subscription_callback(
|
|||||||
welcome_text = _(key="welcome",
|
welcome_text = _(key="welcome",
|
||||||
user_name=hd.quote(callback.from_user.full_name))
|
user_name=hd.quote(callback.from_user.full_name))
|
||||||
if callback.message:
|
if callback.message:
|
||||||
|
try:
|
||||||
|
await callback.message.edit_text(welcome_text)
|
||||||
|
except Exception as welcome_edit_error:
|
||||||
|
logging.debug(
|
||||||
|
"Failed to edit subscription prompt to welcome for user %s: %s",
|
||||||
|
callback.from_user.id,
|
||||||
|
welcome_edit_error,
|
||||||
|
)
|
||||||
await callback.message.answer(welcome_text)
|
await callback.message.answer(welcome_text)
|
||||||
else:
|
else:
|
||||||
fallback_bot: Optional[Bot] = getattr(callback, "bot", None)
|
fallback_bot: Optional[Bot] = getattr(callback, "bot", None)
|
||||||
@@ -577,12 +585,19 @@ async def verify_channel_subscription_callback(
|
|||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
logging.debug("Suppressed exception in bot/handlers/user/start.py: %s", exc)
|
logging.debug("Suppressed exception in bot/handlers/user/start.py: %s", exc)
|
||||||
|
|
||||||
await send_main_menu(callback,
|
menu_target_event: Union[types.Message, types.CallbackQuery] = callback
|
||||||
|
should_edit_menu_message = bool(callback.message)
|
||||||
|
|
||||||
|
if not settings.DISABLE_WELCOME_MESSAGE and callback.message:
|
||||||
|
menu_target_event = callback.message
|
||||||
|
should_edit_menu_message = False
|
||||||
|
|
||||||
|
await send_main_menu(menu_target_event,
|
||||||
settings,
|
settings,
|
||||||
i18n_data,
|
i18n_data,
|
||||||
subscription_service,
|
subscription_service,
|
||||||
session,
|
session,
|
||||||
is_edit=bool(callback.message))
|
is_edit=should_edit_menu_message)
|
||||||
|
|
||||||
|
|
||||||
@router.message(Command("language"))
|
@router.message(Command("language"))
|
||||||
|
|||||||
Reference in New Issue
Block a user