-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Реализовано удаление сообщений с кнопками при вызове хэндлеров этих кнопок. Тикет #121 Добавлен файл src.bot.utils.py, где добавлен декоратор для оборачивания функций, в которых реализуется отправка новых сообщений с инлайн-клавиатурами. Для хэндлеров форм обратной связи декоратор пока не довлен, так как их работа не может быть завершена корректно. Co-authored-by: ConstConstantin <[email protected]> Co-authored-by: Nikita <[email protected]>
- Loading branch information
1 parent
4e2769f
commit 2279c50
Showing
6 changed files
with
55 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
from collections.abc import Awaitable, Callable | ||
from functools import wraps | ||
from typing import ParamSpec, TypeVar | ||
|
||
from telegram import Update | ||
|
||
ReturnType = TypeVar("ReturnType") | ||
ParameterTypes = ParamSpec("ParameterTypes") | ||
|
||
|
||
def delete_previous_message( | ||
coroutine: Callable[ParameterTypes, Awaitable[ReturnType]] | ||
) -> Callable[ParameterTypes, Awaitable[ReturnType]]: | ||
"""Декоратор для функций, отправляющих новые сообщения с inline-кнопками. | ||
После выполнения оборачиваемой функции удаляет сообщение с inline-кнопкой, | ||
нажатие на которую повлекло вызов оборачиваемой функции.""" | ||
|
||
@wraps(coroutine) | ||
async def wrapper(update: Update, *args: ParameterTypes.args, **kwargs: ParameterTypes.kwargs) -> ReturnType: | ||
result = await coroutine(update, *args, **kwargs) | ||
await update.callback_query.message.delete() | ||
return result | ||
|
||
return wrapper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,29 @@ | ||
from collections.abc import Awaitable, Callable | ||
from functools import wraps | ||
from typing import ParamSpec, TypeVar | ||
|
||
import structlog | ||
|
||
ReturnType = TypeVar("ReturnType") | ||
ParameterTypes = ParamSpec("ParameterTypes") | ||
|
||
async def logging_updates(*args, **kwargs): | ||
await log.ainfo("Следующие Updates не были пойманы ни одним из обработчиков", args=args, kwargs=kwargs) | ||
log = structlog.get_logger() | ||
|
||
|
||
log = structlog.get_logger() | ||
async def logging_updates(*args, **kwargs): | ||
await log.ainfo("Следующие Updates не были пойманы ни одним из обработчиков", args=args, kwargs=kwargs) | ||
|
||
|
||
def logger_decor(func): | ||
async def wrapper(*args, **kwargs): | ||
await log.ainfo(f"Запущенна функция {func.__name__}", args=args, kwargs=kwargs) | ||
return await func(*args, **kwargs) | ||
def logger_decor( | ||
coroutine: Callable[ParameterTypes, Awaitable[ReturnType]] | ||
) -> Callable[ParameterTypes, Awaitable[ReturnType]]: | ||
@wraps(coroutine) | ||
async def wrapper(*args: ParameterTypes.args, **kwargs: ParameterTypes.kwargs) -> ReturnType: | ||
await log.ainfo( | ||
f"Запущенна функция {coroutine.__name__}", | ||
args=args, | ||
kwargs=kwargs, | ||
) | ||
return await coroutine(*args, **kwargs) | ||
|
||
return wrapper |