spacenerdmo/pnut-matrix
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity

attempt to handle lack of image info in event #32

Browse source
This commit is contained in:
Morgan McMillian 2018-05-10 07:30:14 -07:00
parent fe4d59811c
commit 632b69f75b
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
appservice.py
View file

@ -65,29 +65,30 @@ def on_receive_events(transaction):
value = {"type": "photo", "version": "1.0"} value = {"type": "photo", "version": "1.0"}
value["title"] = event['content']['body'] value["title"] = event['content']['body']
value["url"] = imgurl value["url"] = imgurl
if 'w' in event['content']['info']: if 'info' in event['content']:
value["width"] = event['content']['info']['w']
else:
value["width"] = 200
if 'h' in event['content']['info']:
value["height"] = event['content']['info']['h']
else:
value["height"] = 200
if 'thumbnail_info' in event['content']['info']:
thmburl = app.config['MATRIX_HOST'] + '/_matrix/media/r0/download/' + event['content']['info']['thumbnail_url'][6:]
value["thumbnail_width"] = event['content']['info']['thumbnail_info']['w']
value["thumbnail_height"] = event['content']['info']['thumbnail_info']['h']
value["thumbnail_url"] = thmburl
else:
if 'w' in event['content']['info']: if 'w' in event['content']['info']:
value["thumbnail_width"] = event['content']['info']['w'] value["width"] = event['content']['info']['w']
else: else:
value["thumbnail_width"] = 200 value["width"] = 200
if 'h' in event['content']['info']: if 'h' in event['content']['info']:
value["thumbnail_height"] = event['content']['info']['h'] value["height"] = event['content']['info']['h']
else: else:
value["thumbnail_height"] = 200 value["height"] = 200
value["thumbnail_url"] = imgurl if 'thumbnail_info' in event['content']['info']:
thmburl = app.config['MATRIX_HOST'] + '/_matrix/media/r0/download/' + event['content']['info']['thumbnail_url'][6:]
value["thumbnail_width"] = event['content']['info']['thumbnail_info']['w']
value["thumbnail_height"] = event['content']['info']['thumbnail_info']['h']
value["thumbnail_url"] = thmburl
else:
if 'w' in event['content']['info']:
value["thumbnail_width"] = event['content']['info']['w']
else:
value["thumbnail_width"] = 200
if 'h' in event['content']['info']:
value["thumbnail_height"] = event['content']['info']['h']
else:
value["thumbnail_height"] = 200
value["thumbnail_url"] = imgurl
rawitem = {"type": "io.pnut.core.oembed", "value": value} rawitem = {"type": "io.pnut.core.oembed", "value": value}
embed = [rawitem] embed = [rawitem]
if user: if user: