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

Allow Client.edit_profile to work with bot accounts.

Browse Source
This commit is contained in:
Rapptz 2016-04-09 21:40:40 -04:00
parent fa14c72836
commit 29d3f5a886
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
discord/client.py
View File

@ -445,6 +445,7 @@ class Client:
def _login_1(self, token): def _login_1(self, token):
log.info('logging in using static token') log.info('logging in using static token')
self.token = token self.token = token
self.email = None
self.headers['authorization'] = 'Bot {}'.format(self.token) self.headers['authorization'] = 'Bot {}'.format(self.token)
resp = yield from self.session.get(endpoints.ME, headers=self.headers) resp = yield from self.session.get(endpoints.ME, headers=self.headers)
yield from resp.release() yield from resp.release()
@ -1448,12 +1449,13 @@ class Client:
yield from response.release() yield from response.release()
@asyncio.coroutine @asyncio.coroutine
def edit_profile(self, password, **fields): def edit_profile(self, password=None, **fields):
"""|coro| """|coro|
Edits the current profile of the client. Edits the current profile of the client.
All fields except ``password`` are optional. If a bot account is used then the password field is optional,
otherwise it is required.
The profile is **not** edited in place. The profile is **not** edited in place.
@ -1469,7 +1471,8 @@ class Client:
Parameters Parameters
----------- -----------
password : str password : str
The current password for the client's account. The current password for the client's account. Not used
for bot accounts.
new_password : str new_password : str
The new password you wish to change to. The new password you wish to change to.
email : str email : str
@ -1486,6 +1489,8 @@ class Client:
Editing your profile failed. Editing your profile failed.
InvalidArgument InvalidArgument
Wrong image format passed for ``avatar``. Wrong image format passed for ``avatar``.
ClientException
Password is required for non-bot accounts.
""" """
try: try:
@ -1498,20 +1503,31 @@ class Client:
else: else:
avatar = None avatar = None
not_bot_account = not self.user.bot
if not_bot_account and password is None:
raise ClientException('Password is required for non-bot accounts.')
payload = { payload = {
'password': password, 'password': password,
'new_password': fields.get('new_password'),
'email': fields.get('email', self.email),
'username': fields.get('username', self.user.name), 'username': fields.get('username', self.user.name),
'avatar': avatar 'avatar': avatar
} }
if not_bot_account:
payload['email'] = fields.get('email', self.email)
if 'new_password' in fields:
payload['new_password'] = fields['new_password']
r = yield from self.session.patch(endpoints.ME, data=utils.to_json(payload), headers=self.headers) r = yield from self.session.patch(endpoints.ME, data=utils.to_json(payload), headers=self.headers)
log.debug(request_logging_format.format(method='PATCH', response=r)) log.debug(request_logging_format.format(method='PATCH', response=r))
yield from utils._verify_successful_response(r) yield from utils._verify_successful_response(r)
data = yield from r.json() data = yield from r.json()
log.debug(request_success_log.format(response=r, json=payload, data=data)) log.debug(request_success_log.format(response=r, json=payload, data=data))
if not_bot_account:
self.token = data['token'] self.token = data['token']
self.email = data['email'] self.email = data['email']
self.headers['authorization'] = self.token self.headers['authorization'] = self.token