fix/removing-messages-once-pushed

src/bot/handlers/categories.py

@@ -6,10 +6,12 @@
 from src.bot.keyboards import get_categories_keyboard, get_open_tasks_and_menu_keyboard
 from src.bot.services.category import CategoryService
 from src.bot.services.user import UserService
+from src.bot.utils import delete_previous
 from src.core.logging.utils import logger_decor
 
 
 @logger_decor
+@delete_previous
 async def categories_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
     user_service = UserService()
     category_service = CategoryService()

src/bot/handlers/menu.py

@@ -19,13 +19,15 @@
 from src.bot.constants import callback_data, commands, enum, patterns
 from src.bot.keyboards import get_back_menu, get_menu_keyboard, get_no_mailing_keyboard
 from src.bot.services.user import UserService
+from src.bot.utils import delete_previous
 from src.core.logging.utils import logger_decor
 from src.settings import settings
 
 log = structlog.get_logger()
 
 
 @logger_decor
+@delete_previous
 async def menu_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Возвращает в меню."""
     await context.bot.send_message(
@@ -36,6 +38,7 @@ async def menu_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
 
 @logger_decor
+@delete_previous
 async def set_mailing(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Включение/выключение подписки пользователя на почтовую рассылку."""
     telegram_id = update.effective_user.id
@@ -118,6 +121,7 @@ async def web_app_data(update: Update):
 
 
 @logger_decor
+@delete_previous
 async def about_project(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await context.bot.send_message(
         chat_id=update.effective_chat.id,

src/bot/handlers/registration.py

@@ -5,6 +5,7 @@
 from src.bot.constants import callback_data, commands
 from src.bot.keyboards import get_confirm_keyboard, get_start_keyboard
 from src.bot.services.user import UserService
+from src.bot.utils import delete_previous
 from src.core.logging.utils import logger_decor
 
 
@@ -34,6 +35,7 @@ async def start_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
 
 @logger_decor
+@delete_previous
 async def confirm_chosen_categories(update: Update, context: ContextTypes.DEFAULT_TYPE):
     keyboard = get_confirm_keyboard()
 

src/bot/handlers/tasks.py

@@ -11,6 +11,7 @@
 )
 from src.bot.services.category import CategoryService
 from src.bot.services.task import TaskService
+from src.bot.utils import delete_previous
 from src.core.logging.utils import logger_decor
 from src.core.utils import display_tasks
 
@@ -70,6 +71,7 @@ async def back_subcategory_callback(update: Update, context: ContextTypes.DEFAUL
 
 
 @logger_decor
+@delete_previous
 async def view_task_callback(update: Update, context: CallbackContext, limit: int = 3):
     task_service = TaskService()
     tasks_to_show, offset, page_number = await task_service.get_user_tasks_by_page(
@@ -84,6 +86,7 @@ async def view_task_callback(update: Update, context: CallbackContext, limit: in
     await show_next_tasks(update, context, limit, offset, page_number)
 
 
+@delete_previous
 async def show_next_tasks(update: Update, context: CallbackContext, limit: int, offset: int, page_number: int):
     task_service = TaskService()
     remaining_tasks = await task_service.get_remaining_user_tasks_count(limit, offset)

src/bot/utils.py

@@ -0,0 +1,22 @@
+from telegram import Update
+
+
+def delete_previous(coroutine):
+    """Для функций, отправляющих сообщения с inline-кнопками.
+    Удаляет сообщение с кнопками, приведшее к вызову функции."""
+
+    async def wrapper(*args, **kwargs):
+        result = await coroutine(*args, **kwargs)
+        if "update" in kwargs and isinstance(kwargs["update"], Update):
+            update = kwargs["update"]
+        else:
+            for arg in args:
+                if isinstance(arg, Update):
+                    update = arg
+                    break
+            else:
+                return result  # если нет update, просто возвращаем результат работы
+        await update.callback_query.message.delete()
+        return result
+
+    return wrapper