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

Client.register now takes an invite URL or class.

Browse Source
This commit is contained in:
Rapptz 2015-10-11 07:28:55 -04:00
parent 03d477edd8
commit 6074fe0783
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
discord/client.py
View File

@ -398,6 +398,16 @@ class Client(object):
else:
return []
def _resolve_invite(self, invite):
if isinstance(invite, Invite):
return invite.id
else:
rx = r'(?:https?\:\/\/)?discord\.gg\/(.+)'
m = re.match(rx, invite)
if m:
return m.group(1)
return None
def on_error(self, event_method, *args, **kwargs):
msg = 'Caught exception in {} with args (*{}, **{})'
log.exception(msg.format(event_method, args, kwargs))
@ -630,14 +640,14 @@ class Client(object):
occur.
:param str username: The username to register as.
:param str invite: The invite to register with.
:param invite: An invite URL or :class:`Invite` to register with.
:param str fingerprint: Unkown API parameter, defaults to None
"""
payload = {
'fingerprint': fingerprint,
'username': username,
'invite': invite
'invite': self._resolve_invite(invite)
}
r = requests.post(endpoints.REGISTER, json=payload)
@ -919,14 +929,7 @@ class Client(object):
:returns: True if the invite was successfully accepted, False otherwise.
"""
destination = None
if isinstance(invite, Invite):
destination = invite.id
else:
rx = r'(?:https?\:\/\/)?discord\.gg\/(.+)'
m = re.match(rx, invite)
if m:
destination = m.group(1)
destination = self._resolve_invite(invite)
if destination is None:
return False