stonewareslord/telematrix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Possibly fix image sending bug

Browse Source
This commit is contained in:
Sijmen Schoon 2016-09-26 04:00:23 +02:00
parent e883055e61
commit 9c91711740
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app_service.py
View File

@ -175,13 +175,11 @@ async def _matrix_request(method_fun, category, path, user_id, data=None,
content_type=None): content_type=None):
# pylint: disable=too-many-arguments # pylint: disable=too-many-arguments
# Due to this being a helper function, the argument count acceptable # Due to this being a helper function, the argument count acceptable
buffer = None
if data is not None: if data is not None:
if isinstance(data, dict): if isinstance(data, dict):
buffer = json.dumps(data) data = json.dumps(data)
content_type = 'application/json; charset=utf-8' content_type = 'application/json; charset=utf-8'
elif content_type is None: elif content_type is None:
buffer = data
content_type = 'application/octet-stream' content_type = 'application/octet-stream'
params = {'access_token': AS_TOKEN} params = {'access_token': AS_TOKEN}
@ -190,7 +188,7 @@ async def _matrix_request(method_fun, category, path, user_id, data=None,
async with method_fun('{}_matrix/{}/r0/{}' async with method_fun('{}_matrix/{}/r0/{}'
.format(MATRIX_HOST, quote(category), quote(path)), .format(MATRIX_HOST, quote(category), quote(path)),
params=params, data=buffer, params=params, data=data,
headers={'Content-Type': content_type}) as response: headers={'Content-Type': content_type}) as response:
if response.headers['Content-Type'].split(';')[0] \ if response.headers['Content-Type'].split(';')[0] \
== 'application/json': == 'application/json':