diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 11:15:31 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 11:22:41 +0000 |
commit | 227c491510e09bc201b835a7dfa84aaeafb3cdc6 (patch) | |
tree | 837c00cd1cba79935990096c9f9296100e004c45 /synapse/rest/media/v1/_base.py | |
parent | Add StorageProvider concept (diff) | |
download | synapse-227c491510e09bc201b835a7dfa84aaeafb3cdc6.tar.xz |
Comments
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
-rw-r--r-- | synapse/rest/media/v1/_base.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index 1310820486..03df875b44 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py @@ -134,9 +134,9 @@ def respond_with_responder(request, responder, media_type, file_size, upload_nam Args: request (twisted.web.http.Request) - responder (Responder) + responder (Responder|None) media_type (str): The media/content type. - file_size (int): Size in bytes of the media, if known. + file_size (int): Size in bytes of the media. If not known it should be None upload_name (str): The name of the requested file, if any. """ if not responder: @@ -179,13 +179,12 @@ class FileInfo(object): or None if local. file_id (str): The local ID of the file. For local files this is the same as the media_id - media_type (str): Type of the file url_cache (bool): If the file is for the url preview cache thumbnail (bool): Whether the file is a thumbnail or not. thumbnail_width (int) thumbnail_height (int) - thumbnail_method (int) - thumbnail_type (str) + thumbnail_method (str) + thumbnail_type (str): Content type of thumbnail, e.g. image/png """ def __init__(self, server_name, file_id, url_cache=False, thumbnail=False, thumbnail_width=None, thumbnail_height=None, |