Merge branch 'master' into independent-login

2018-02-21 23:36:09 +02:00
parent 29c71b48de 2d13c30a26
commit b4d23af05d
4 changed files with 13 additions and 4 deletions
@@ -44,7 +44,7 @@ def _convert_webp(file, to="png"):
 async def transfer_file_to_matrix(db, client, intent, location):
    if isinstance(location, (Document, InputDocumentFileLocation)):
        id = f"{location.id}-{location.version}"
-    elif not isinstance(location, (FileLocation, InputFileLocation)):
+    elif isinstance(location, (FileLocation, InputFileLocation)):
        id = f"{location.volume_id}-{location.local_id}"
    else:
        return None