CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-12-05 17:02:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support all Messageables in bot.embed_requested() (#5576)

Browse Source 
* Support all Messageables in bot.embed_requested

* Update usage in core

* Simplify [p]contact

This couldn't be done before this change.

I have also simplified getting embed color.

* Make `True` the new default for `check_permissions` kwarg
This commit is contained in:
jack1142
2022-03-21 17:22:55 +01:00
committed by GitHub
parent f763d29fd4
commit 0f299ae195
7 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
redbot/core/bot.py
View File

@@ -1205,26 +1205,24 @@ class Red(
async def embed_requested(
self,
channel: Union[discord.abc.GuildChannel, discord.abc.PrivateChannel],
user: discord.abc.User,
command: Optional[commands.Command] = None,
channel: discord.abc.Messageable,
*,
check_permissions: bool = False,
command: Optional[commands.Command] = None,
check_permissions: bool = True,
) -> bool:
"""
Determine if an embed is requested for a response.
Arguments
---------
channel : `discord.abc.GuildChannel` or `discord.abc.PrivateChannel`
The channel to check embed settings for.
user : `discord.abc.User`
The user to check embed settings for.
command : `redbot.core.commands.Command`, optional
The command ran.
channel : `discord.abc.Messageable`
The target messageable object to check embed settings for.
Keyword Arguments
-----------------
command : `redbot.core.commands.Command`, optional
The command ran.
This is auto-filled when ``channel`` is passed with command context.
check_permissions : `bool`
If ``True``, this method will also check whether the bot can send embeds
in the given channel and if it can't, it will return ``False`` regardless of
@@ -1242,10 +1240,12 @@ class Red(
scope = self._config.custom(COMMAND_SCOPE, command.qualified_name, guild_id)
return await scope.embeds()
if isinstance(channel, discord.abc.PrivateChannel):
if (user_setting := await self._config.user(user).embeds()) is not None:
return user_setting
else:
# using dpy_commands.Context to keep the Messageable contract in full
if isinstance(channel, dpy_commands.Context):
command = command or channel.command
channel = channel.channel
if isinstance(channel, discord.TextChannel):
if check_permissions and not channel.permissions_for(channel.guild.me).embed_links:
return False
@@ -1257,6 +1257,13 @@ class Red(
if (guild_setting := await self._config.guild(channel.guild).embeds()) is not None:
return guild_setting
elif isinstance(channel, discord.GroupChannel):
# this only uses global settings
pass
else:
user = channel.recipient if isinstance(discord.DMChannel) else channel
if (user_setting := await self._config.user(user).embeds()) is not None:
return user_setting
# XXX: maybe this should be checked before guild setting?
if (global_command_setting := await get_command_setting(0)) is not None: