matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[bugs] stop resolving Object for template/invite; remove dupe methods

Browse Source
This commit is contained in:
NCPlayz
2020-06-29 16:58:19 +01:00
parent b68cbb7a42
commit ce03c62c6b
4 changed files with 18 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
discord/utils.py
View File

@ -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)