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

Fix multipart sending for RequestsWebhookAdapter to work.

Browse Source
This commit is contained in:
Rapptz 2018-01-03 21:55:48 -05:00
parent 6813280938
commit 30b5047b0e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
discord/webhook.py
View File

@ -147,7 +147,7 @@ class AsyncWebhookAdapter(WebhookAdapter):
file = multipart.pop('file', None) file = multipart.pop('file', None)
data = aiohttp.FormData() data = aiohttp.FormData()
if file: if file:
data.add_field('file', file[0], filename=file[1], content_type=file[2]) data.add_field('file', file[1], filename=file[0], content_type=file[2])
for key, value in multipart.items(): for key, value in multipart.items():
data.add_field(key, value) data.add_field(key, value)
@ -226,6 +226,9 @@ class RequestsWebhookAdapter(WebhookAdapter):
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
data = utils.to_json(payload) data = utils.to_json(payload)
if multipart is not None:
data = { 'payload_json': multipart.pop('payload_json') }
for tries in range(5): for tries in range(5):
r = self.session.request(verb, url, headers=headers, data=data, files=multipart) r = self.session.request(verb, url, headers=headers, data=data, files=multipart)
r.encoding = 'utf-8' r.encoding = 'utf-8'
@ -647,7 +650,7 @@ class Webhook:
if file is not None: if file is not None:
try: try:
to_pass = (file.open_file(), file.filename, 'application/octet-stream') to_pass = (file.filename, file.open_file(), 'application/octet-stream')
return self._adapter.execute_webhook(wait=wait, file=to_pass, payload=payload) return self._adapter.execute_webhook(wait=wait, file=to_pass, payload=payload)
finally: finally:
file.close() file.close()