diff options
| author | NCPlayz <[email protected]> | 2020-06-29 16:58:19 +0100 |
|---|---|---|
| committer | NCPlayz <[email protected]> | 2020-06-29 16:58:19 +0100 |
| commit | ce03c62c6b573653d546ab289c9718242b3bbaa6 (patch) | |
| tree | 43667c954d2913af3d8ff4bc7b9fb3a94ad8a23f /discord/utils.py | |
| parent | Add support for bulk editing role positions (diff) | |
| download | discord.py-ce03c62c6b573653d546ab289c9718242b3bbaa6.tar.xz discord.py-ce03c62c6b573653d546ab289c9718242b3bbaa6.zip | |
[bugs] stop resolving Object for template/invite; remove dupe methods
Diffstat (limited to 'discord/utils.py')
| -rw-r--r-- | discord/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/discord/utils.py b/discord/utils.py index 9c4bd43a..e42f5679 100644 --- a/discord/utils.py +++ b/discord/utils.py @@ -442,8 +442,8 @@ def resolve_invite(invite): The invite code. """ from .invite import Invite # circular import - if isinstance(invite, (Invite, Object)): - return invite.id + if isinstance(invite, Invite): + return invite.code else: rx = r'(?:https?\:\/\/)?discord(?:\.gg|(?:app)?\.com\/invite)\/(.+)' m = re.match(rx, invite) @@ -453,8 +453,8 @@ def resolve_invite(invite): def resolve_template(code): from .template import Template # circular import - if isinstance(code, (Template, Object)): - return template.id + if isinstance(code, Template): + return template.code else: rx = r'(?:https?\:\/\/)?discord(?:\.new|(?:app)?\.com\/template)\/(.+)' m = re.match(rx, code) |