mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-08 12:48:39 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Add support for channel URLs in channel converter

Browse Source 
Fix #9799
This commit is contained in:
Rapptz 2024-06-02 15:00:24 -04:00
parent 356474ffb9
commit 0e58a927dd
1 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,19 +438,36 @@ class GuildChannelConverter(IDConverter[discord.abc.GuildChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name. 3. Lookup by channel URL.
4. Lookup by name.
.. versionadded:: 2.0 .. versionadded:: 2.0
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.abc.GuildChannel: async def convert(self, ctx: Context[BotT], argument: str) -> discord.abc.GuildChannel:
return self._resolve_channel(ctx, argument, 'channels', discord.abc.GuildChannel) return self._resolve_channel(ctx, argument, 'channels', discord.abc.GuildChannel)
@staticmethod
def _parse_from_url(argument: str) -> Optional[re.Match[str]]:
link_regex = re.compile(
r'https?://(?:(?:ptb|canary|www)\.)?discord(?:app)?\.com/channels/'
r'(?:[0-9]{15,20}|@me)'
r'/([0-9]{15,20})(?:/(?:[0-9]{15,20})/?)?$'
)
return link_regex.match(argument)
@staticmethod @staticmethod
def _resolve_channel(ctx: Context[BotT], argument: str, attribute: str, type: Type[CT]) -> CT: def _resolve_channel(ctx: Context[BotT], argument: str, attribute: str, type: Type[CT]) -> CT:
bot = ctx.bot bot = ctx.bot
match = IDConverter._get_id_match(argument) or re.match(r'<#([0-9]{15,20})>$', argument) match = (
IDConverter._get_id_match(argument)
or re.match(r'<#([0-9]{15,20})>$', argument)
or GuildChannelConverter._parse_from_url(argument)
)
result = None result = None
guild = ctx.guild guild = ctx.guild
@ -480,7 +497,11 @@ class GuildChannelConverter(IDConverter[discord.abc.GuildChannel]):
@staticmethod @staticmethod
def _resolve_thread(ctx: Context[BotT], argument: str, attribute: str, type: Type[TT]) -> TT: def _resolve_thread(ctx: Context[BotT], argument: str, attribute: str, type: Type[TT]) -> TT:
match = IDConverter._get_id_match(argument) or re.match(r'<#([0-9]{15,20})>$', argument) match = (
IDConverter._get_id_match(argument)
or re.match(r'<#([0-9]{15,20})>$', argument)
or GuildChannelConverter._parse_from_url(argument)
)
result = None result = None
guild = ctx.guild guild = ctx.guild
@ -510,10 +531,14 @@ class TextChannelConverter(IDConverter[discord.TextChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name 3. Lookup by channel URL.
4. Lookup by name
.. versionchanged:: 1.5 .. versionchanged:: 1.5
Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument` Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument`
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.TextChannel: async def convert(self, ctx: Context[BotT], argument: str) -> discord.TextChannel:
@ -530,10 +555,14 @@ class VoiceChannelConverter(IDConverter[discord.VoiceChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name 3. Lookup by channel URL.
4. Lookup by name
.. versionchanged:: 1.5 .. versionchanged:: 1.5
Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument` Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument`
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.VoiceChannel: async def convert(self, ctx: Context[BotT], argument: str) -> discord.VoiceChannel:
@ -552,7 +581,11 @@ class StageChannelConverter(IDConverter[discord.StageChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name 3. Lookup by channel URL.
4. Lookup by name
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.StageChannel: async def convert(self, ctx: Context[BotT], argument: str) -> discord.StageChannel:
@ -569,7 +602,11 @@ class CategoryChannelConverter(IDConverter[discord.CategoryChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name 3. Lookup by channel URL.
4. Lookup by name
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
.. versionchanged:: 1.5 .. versionchanged:: 1.5
Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument` Raise :exc:`.ChannelNotFound` instead of generic :exc:`.BadArgument`
@ -588,9 +625,13 @@ class ThreadConverter(IDConverter[discord.Thread]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name. 3. Lookup by channel URL.
4. Lookup by name.
.. versionadded: 2.0 .. versionadded: 2.0
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.Thread: async def convert(self, ctx: Context[BotT], argument: str) -> discord.Thread:
@ -607,9 +648,13 @@ class ForumChannelConverter(IDConverter[discord.ForumChannel]):
1. Lookup by ID. 1. Lookup by ID.
2. Lookup by mention. 2. Lookup by mention.
3. Lookup by name 3. Lookup by channel URL.
4. Lookup by name
.. versionadded:: 2.0 .. versionadded:: 2.0
.. versionchanged:: 2.4
Add lookup by channel URL, accessed via "Copy Link" in the Discord client within channels.
""" """
async def convert(self, ctx: Context[BotT], argument: str) -> discord.ForumChannel: async def convert(self, ctx: Context[BotT], argument: str) -> discord.ForumChannel: