mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-04 09:10:11 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Fix issue in PartialMessageConverter._resolve channel

Browse Source
This commit is contained in:
Josh 2022-02-19 14:00:52 +10:00 committed by GitHub
parent de78a1071f
commit 61974411df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
discord/ext/commands/converter.py
View File

@ -353,14 +353,17 @@ class PartialMessageConverter(Converter[discord.PartialMessage]):
@staticmethod @staticmethod
def _resolve_channel(ctx, guild_id, channel_id) -> Optional[PartialMessageableChannel]: def _resolve_channel(ctx, guild_id, channel_id) -> Optional[PartialMessageableChannel]:
if channel_id is None:
# we were passed just a message id so we can assume the channel is the current context channel
return ctx.channel
if guild_id is not None: if guild_id is not None:
guild = ctx.bot.get_guild(guild_id) guild = ctx.bot.get_guild(guild_id)
if guild is not None and channel_id is not None: if guild is None:
return guild._resolve_channel(channel_id) # type: ignore
else:
return None return None
else: return guild._resolve_channel(channel_id)
return ctx.bot.get_channel(channel_id) if channel_id else ctx.channel
return ctx.bot.get_channel(channel_id)
async def convert(self, ctx: Context, argument: str) -> discord.PartialMessage: async def convert(self, ctx: Context, argument: str) -> discord.PartialMessage:
guild_id, message_id, channel_id = self._get_id_matches(ctx, argument) guild_id, message_id, channel_id = self._get_id_matches(ctx, argument)