diff --git a/other_ext/webhook_helper.py b/other_ext/webhook_helper.py index 9a63dba..3a3ec4a 100644 --- a/other_ext/webhook_helper.py +++ b/other_ext/webhook_helper.py @@ -139,6 +139,7 @@ class Extension: if type(result) == list: kwargs["message"] = message + kwargs["content_to_response"] = f"{user.mention}!\nДействие {payload.emoji} дало ответ:" return await result[0](**kwargs) except NotFoundPlayerOnServer: return await message.channel.send(content=f"{user.mention}!\nДействие {payload.emoji} сообщило что игрок сейчас не играет на сервере!\nВозможен пиздеж и провокация!", delete_after=60) diff --git a/user_ext/profile.py b/user_ext/profile.py index ce84081..59bf304 100644 --- a/user_ext/profile.py +++ b/user_ext/profile.py @@ -3,6 +3,8 @@ import traceback import time import io +from discord.utils import MISSING + class Extension: core = None def __init__(self, core): @@ -24,7 +26,8 @@ class Extension: interaction: discord.Interaction = None, profile: str = "", message: discord.Message = None, - discord_user: discord.Member = None + discord_user: discord.Member = None, + content_to_response: str = "" ): if interaction: await interaction.response.defer(thinking=True) @@ -47,15 +50,28 @@ class Extension: if file and filename: embed.set_image(url=f"attachment://{filename}") if interaction: - return await interaction.followup.send(embed=embed, file=file, ephemeral=False) + return await interaction.followup.send( + content = content_to_response if content_to_response else MISSING, + embed=embed, + file=file, + ephemeral=False) if message: - return await message.channel.send(embed=embed, file=file) + return await message.channel.send( + content = content_to_response if content_to_response else MISSING, + embed=embed, + file=file) raise Exception('Unknown processor') else: if interaction: - return await interaction.followup.send(embed=embed, ephemeral=False) + return await interaction.followup.send( + content = content_to_response if content_to_response else MISSING, + embed=embed, + ephemeral=False) if message: - return await message.channel.send(embed=embed, ephemeral=False) + return await message.channel.send( + content = content_to_response if content_to_response else MISSING, + embed=embed, + ephemeral=False) raise Exception('Unknown processor') async def __call__(self, *args, **kwds):