diff options
| -rw-r--r-- | callbacks.py | 10 | ||||
| -rw-r--r-- | main.py | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/callbacks.py b/callbacks.py index 432c0af..f6649a7 100644 --- a/callbacks.py +++ b/callbacks.py @@ -361,7 +361,7 @@ async def set_markdown_callback(callback: CallbackQuery): @router.callback_query(F.data.startswith("new_md%")) -async def set_markdown_callback(callback: CallbackQuery): +async def set_markdown_callback(callback: CallbackQuery, message=None): current_user_id = str(callback.from_user.id) data = callback.data.split("%", 2) user_id = data[1] @@ -378,11 +378,14 @@ async def set_markdown_callback(callback: CallbackQuery): config.get("notify"), "new", ) + if message: + await message.delete() await callback.answer("выбран новый стиль!!") + await callback.message.delete() @router.callback_query(F.data.startswith("old_md%")) -async def set_markdown_callback(callback: CallbackQuery): +async def set_markdown_callback(callback: CallbackQuery, message=None): current_user_id = str(callback.from_user.id) data = callback.data.split("%", 2) user_id = data[1] @@ -399,7 +402,10 @@ async def set_markdown_callback(callback: CallbackQuery): config.get("notify"), "old", ) + if message: + await message.delete() await callback.answer("выбран старый стиль!!") + await callback.message.delete() @router.callback_query(F.data == "start") @@ -312,14 +312,14 @@ async def guest_middleware(handler, event, data): ] ) reply_markup = InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text="новый стиль", callback_data=f"set_markdown%{user_id}%new")], - [InlineKeyboardButton(text="старый стиль", callback_data=f"set_markdown%{user_id}%old")], + [InlineKeyboardButton(text="новый стиль", callback_data=f"new_md%{user_id}")], + [InlineKeyboardButton(text="старый стиль", callback_data=f"old_md%{user_id}")], ] ) if event.guest_message: await g_answer(data, message, alloh_one_text, reply_markup=reply_markup_url) elif event.message: - await message.reply_rich(InputRichMessage(markdown="# ало\n```\nкак дела\n```")) + await message.reply_rich(InputRichMessage(markdown="# новый крутой стилёк\n*da*\n```\nтестовое сообщение врат\n```")) await message.answer(alloh_text, reply_markup=reply_markup) return |