From aae253c540af1cb03b437647e98eea16e9f40ffa Mon Sep 17 00:00:00 2001
From: mihalin <stopa3.10.1996@mail.ru>
Date: Mon, 6 Sep 2021 02:15:41 +0300
Subject: [PATCH] edit message

---
 olgram/commands/menu.py | 19 ++++++++++++-------
 olgram/utils/mix.py     | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/olgram/commands/menu.py b/olgram/commands/menu.py
index b2ed7d0..53bbb58 100644
--- a/olgram/commands/menu.py
+++ b/olgram/commands/menu.py
@@ -5,6 +5,7 @@ from olgram.models.models import Bot, User
 from aiogram.dispatcher import FSMContext
 from aiogram.utils.callback_data import CallbackData
 from textwrap import dedent
+from olgram.utils.mix import edit_or_create
 
 
 menu_callback = CallbackData('menu', 'level', 'bot_id', 'operation', 'chat')
@@ -12,7 +13,7 @@ menu_callback = CallbackData('menu', 'level', 'bot_id', 'operation', 'chat')
 empty = "0"
 
 
-async def send_bots_menu(chat_id: int, user_id: int):
+async def send_bots_menu(chat_id: int, user_id: int, call=None):
     """
     Отправить пользователю список ботов
     :return:
@@ -35,7 +36,11 @@ async def send_bots_menu(chat_id: int, user_id: int):
                                                                        chat=empty))
         )
 
-    await AioBot.get_current().send_message(chat_id, "Ваши боты", reply_markup=keyboard)
+    text = "Ваши боты"
+    if call:
+        await edit_or_create(call, text, keyboard)
+    else:
+        await AioBot.get_current().send_message(chat_id, text, reply_markup=keyboard)
 
 
 async def send_chats_menu(bot: Bot, call: types.CallbackQuery):
@@ -72,7 +77,7 @@ async def send_chats_menu(bot: Bot, call: types.CallbackQuery):
         Выберите чат, куда бот будет пересылать сообщения. 
         """)
 
-    await AioBot.get_current().send_message(call.message.chat.id, text, reply_markup=keyboard)
+    await edit_or_create(call, text, keyboard)
 
 
 async def send_bot_menu(bot: Bot, call: types.CallbackQuery):
@@ -94,7 +99,7 @@ async def send_bot_menu(bot: Bot, call: types.CallbackQuery):
                                    callback_data=menu_callback.new(level=0, bot_id=empty, operation=empty, chat=empty))
     )
 
-    await AioBot.get_current().send_message(call.message.chat.id, dedent(f"""
+    await edit_or_create(call, dedent(f"""
     Управление ботом @{bot.name}.
 
     Если у вас возникли вопросы по настройке бота, то посмотрите нашу справку /help.
@@ -113,7 +118,7 @@ async def send_bot_delete_menu(bot: Bot, call: types.CallbackQuery):
                                    callback_data=menu_callback.new(level=1, bot_id=bot.id, operation=empty, chat=empty))
     )
 
-    await AioBot.get_current().send_message(call.message.chat.id, dedent(f"""
+    await edit_or_create(call, dedent(f"""
     Вы уверены, что хотите удалить бота @{bot.name}?
     """), reply_markup=keyboard)
 
@@ -141,7 +146,7 @@ async def send_bot_text_menu(bot: Bot, call: types.CallbackQuery):
     Отправьте сообщение, чтобы изменить текст.
     """)
     text = text.format(bot.start_text)
-    await AioBot.get_current().send_message(call.message.chat.id, text, reply_markup=keyboard, parse_mode="markdown")
+    await edit_or_create(call, text, keyboard, parse_mode="markdown")
 
 
 @dp.callback_query_handler(menu_callback.filter(), state="*")
@@ -151,7 +156,7 @@ async def callback(call: types.CallbackQuery, callback_data: dict, state: FSMCon
     level = callback_data.get("level")
 
     if level == "0":
-        return await send_bots_menu(call.message.chat.id, call.from_user.id)
+        return await send_bots_menu(call.message.chat.id, call.from_user.id, call)
 
     bot_id = callback_data.get("bot_id")
     bot = await Bot.get_or_none(id=bot_id)
diff --git a/olgram/utils/mix.py b/olgram/utils/mix.py
index 57b4802..ba82db9 100644
--- a/olgram/utils/mix.py
+++ b/olgram/utils/mix.py
@@ -1,9 +1,22 @@
-from aiogram.types import Message
+from aiogram.types import Message, CallbackQuery, InlineKeyboardMarkup
 from aiogram.utils.exceptions import TelegramAPIError
 
+from typing import Optional
+
 
 async def try_delete_message(message: Message):
     try:
         await message.delete()
     except TelegramAPIError:
         pass
+
+
+async def edit_or_create(call: CallbackQuery, message: str,
+                         reply_markup: Optional[InlineKeyboardMarkup] = None,
+                         parse_mode: Optional[str] = None):
+    try:
+        await call.message.edit_text(message, parse_mode=parse_mode)
+        await call.message.edit_reply_markup(reply_markup)
+    except TelegramAPIError:  # кнопка устарела
+        await call.bot.send_message(call.message.chat.id, text=message, reply_markup=reply_markup,
+                                    parse_mode=parse_mode)