Browse Source

embed fix 3.5

master
gsd 1 month ago
parent
commit
c35f1eb304
  1. 1
      other_ext/webhook_helper.py
  2. 26
      user_ext/profile.py

1
other_ext/webhook_helper.py

@ -139,6 +139,7 @@ class Extension:
if type(result) == list: if type(result) == list:
kwargs["message"] = message kwargs["message"] = message
kwargs["content_to_response"] = f"{user.mention}!\nДействие {payload.emoji} дало ответ:"
return await result[0](**kwargs) return await result[0](**kwargs)
except NotFoundPlayerOnServer: except NotFoundPlayerOnServer:
return await message.channel.send(content=f"{user.mention}!\nДействие {payload.emoji} сообщило что игрок сейчас не играет на сервере!\nВозможен пиздеж и провокация!", delete_after=60) return await message.channel.send(content=f"{user.mention}!\nДействие {payload.emoji} сообщило что игрок сейчас не играет на сервере!\nВозможен пиздеж и провокация!", delete_after=60)

26
user_ext/profile.py

@ -3,6 +3,8 @@ import traceback
import time import time
import io import io
from discord.utils import MISSING
class Extension: class Extension:
core = None core = None
def __init__(self, core): def __init__(self, core):
@ -24,7 +26,8 @@ class Extension:
interaction: discord.Interaction = None, interaction: discord.Interaction = None,
profile: str = "", profile: str = "",
message: discord.Message = None, message: discord.Message = None,
discord_user: discord.Member = None discord_user: discord.Member = None,
content_to_response: str = ""
): ):
if interaction: if interaction:
await interaction.response.defer(thinking=True) await interaction.response.defer(thinking=True)
@ -47,15 +50,28 @@ class Extension:
if file and filename: if file and filename:
embed.set_image(url=f"attachment://{filename}") embed.set_image(url=f"attachment://{filename}")
if interaction: 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: 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') raise Exception('Unknown processor')
else: else:
if interaction: 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: 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') raise Exception('Unknown processor')
async def __call__(self, *args, **kwds): async def __call__(self, *args, **kwds):

Loading…
Cancel
Save