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

Client.send_file can now send content along with the message.

Browse Source 
There is a breaking change here. We have to change the filename
parameter to be a keyword only argument so there are fewer errors
and surprises.
This commit is contained in:
Rapptz
2016-02-18 19:29:25 -05:00
parent 91ac96daef
commit 89de0e7e9f
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
discord/client.py
View File

@@ -1017,7 +1017,7 @@ class Client:
yield from response.release() yield from response.release()
@asyncio.coroutine @asyncio.coroutine
def send_file(self, destination, fp, filename=None): def send_file(self, destination, fp, *, filename=None, content=None, tts=False):
"""|coro| """|coro|
Sends a message to the destination given with the file given. Sends a message to the destination given with the file given.
@@ -1046,6 +1046,11 @@ class Client:
The *file-like object* or file path to send. The *file-like object* or file path to send.
filename : str filename : str
The filename of the file. Defaults to ``fp.name`` if it's available. The filename of the file. Defaults to ``fp.name`` if it's available.
content
The content of the message to send along with the file. This is
forced into a string by a ``str(content)`` call.
tts : bool
If the content of the message should be sent with TTS enabled.
Raises Raises
------- -------
@@ -1061,7 +1066,12 @@ class Client:
channel_id = yield from self._resolve_destination(destination) channel_id = yield from self._resolve_destination(destination)
url = '{base}/{id}/messages'.format(base=endpoints.CHANNELS, id=channel_id) url = '{base}/{id}/messages'.format(base=endpoints.CHANNELS, id=channel_id)
files = aiohttp.FormData() form = aiohttp.FormData()
if content is not None:
form.add_field('content', str(content))
form.add_field('tts', 'true' if tts else 'false')
# we don't want the content-type json in this request # we don't want the content-type json in this request
headers = self.headers.copy() headers = self.headers.copy()
@@ -1070,11 +1080,11 @@ class Client:
try: try:
# attempt to open the file and send the request # attempt to open the file and send the request
with open(fp, 'rb') as f: with open(fp, 'rb') as f:
files.add_field('file', f, filename=filename, content_type='application/octet-stream') form.add_field('file', f, filename=filename, content_type='application/octet-stream')
response = yield from self.session.post(url, data=files, headers=headers) response = yield from self.session.post(url, data=form, headers=headers)
except TypeError: except TypeError:
files.add_field('file', fp, filename=filename, content_type='application/octet-stream') form.add_field('file', fp, filename=filename, content_type='application/octet-stream')
response = yield from self.session.post(url, data=files, headers=headers) response = yield from self.session.post(url, data=form, headers=headers)
log.debug(request_logging_format.format(method='POST', response=response)) log.debug(request_logging_format.format(method='POST', response=response))
yield from utils._verify_successful_response(response) yield from utils._verify_successful_response(response)