iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix some potential errors in matrix file handling

Browse Source
This commit is contained in:
Tulir Asokan
2018-04-29 22:50:47 +03:00
parent bb13813952
commit db5441c3eb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/portal.py
+6 -3
View File
@@ -575,7 +575,10 @@ class Portal:
return body return body
except (ValueError, KeyError): except (ValueError, KeyError):
pass pass
return f"matrix_upload{mimetypes.guess_extension(mime)}" if mime:
return f"matrix_upload{mimetypes.guess_extension(mime)}"
else:
return ""
async def leave_matrix(self, user, source, event_id): async def leave_matrix(self, user, source, event_id):
if not user.logged_in: if not user.logged_in:
@@ -710,8 +713,8 @@ class Portal:
async def _handle_matrix_file(self, type, sender_id, event_id, space, client, message, reply_to): async def _handle_matrix_file(self, type, sender_id, event_id, space, client, message, reply_to):
file = await self.main_intent.download_file(message["url"]) file = await self.main_intent.download_file(message["url"])
info = message["info"] info = message.get("info", {})
mime = info["mimetype"] mime = info.get("mimetype", None)
if type == "m.sticker": if type == "m.sticker":
mime, file, w, h = util.convert_image(file, source_mime=mime, target_type="webp") mime, file, w, h = util.convert_image(file, source_mime=mime, target_type="webp")