diff options
Diffstat (limited to '')
-rw-r--r-- | synapse/rest/media/__init__.py (renamed from synapse/media/__init__.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v0/__init__.py (renamed from synapse/media/v0/__init__.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v0/content_repository.py (renamed from synapse/media/v0/content_repository.py) | 2 | ||||
-rw-r--r-- | synapse/rest/media/v1/__init__.py (renamed from synapse/media/v1/__init__.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/base_resource.py (renamed from synapse/media/v1/base_resource.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/download_resource.py (renamed from synapse/media/v1/download_resource.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/filepath.py (renamed from synapse/media/v1/filepath.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/media_repository.py (renamed from synapse/media/v1/media_repository.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py (renamed from synapse/media/v1/thumbnail_resource.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/thumbnailer.py (renamed from synapse/media/v1/thumbnailer.py) | 0 | ||||
-rw-r--r-- | synapse/rest/media/v1/upload_resource.py (renamed from synapse/media/v1/upload_resource.py) | 2 |
11 files changed, 2 insertions, 2 deletions
diff --git a/synapse/media/__init__.py b/synapse/rest/media/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/synapse/media/__init__.py +++ b/synapse/rest/media/__init__.py diff --git a/synapse/media/v0/__init__.py b/synapse/rest/media/v0/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/synapse/media/v0/__init__.py +++ b/synapse/rest/media/v0/__init__.py diff --git a/synapse/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index 79ae0e3d74..22e26e3cd5 100644 --- a/synapse/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -66,7 +66,7 @@ class ContentRepoResource(resource.Resource): @defer.inlineCallbacks def map_request_to_name(self, request): # auth the user - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( diff --git a/synapse/media/v1/__init__.py b/synapse/rest/media/v1/__init__.py index d6c6690577..d6c6690577 100644 --- a/synapse/media/v1/__init__.py +++ b/synapse/rest/media/v1/__init__.py diff --git a/synapse/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py index 688e7376ad..688e7376ad 100644 --- a/synapse/media/v1/base_resource.py +++ b/synapse/rest/media/v1/base_resource.py diff --git a/synapse/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py index c585bb11f7..c585bb11f7 100644 --- a/synapse/media/v1/download_resource.py +++ b/synapse/rest/media/v1/download_resource.py diff --git a/synapse/media/v1/filepath.py b/synapse/rest/media/v1/filepath.py index ed9a58e9d9..ed9a58e9d9 100644 --- a/synapse/media/v1/filepath.py +++ b/synapse/rest/media/v1/filepath.py diff --git a/synapse/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py index 461cc001f1..461cc001f1 100644 --- a/synapse/media/v1/media_repository.py +++ b/synapse/rest/media/v1/media_repository.py diff --git a/synapse/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 84f5e3463c..84f5e3463c 100644 --- a/synapse/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py diff --git a/synapse/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 28404f2b7b..28404f2b7b 100644 --- a/synapse/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py diff --git a/synapse/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index b1718a630b..b939a30e19 100644 --- a/synapse/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -42,7 +42,7 @@ class UploadResource(BaseMediaResource): @defer.inlineCallbacks def _async_render_POST(self, request): try: - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) # TODO: The checks here are a bit late. The content will have # already been uploaded to a tmp file at this point content_length = request.getHeader("Content-Length") |