summary refs log tree commit diff
path: root/synapse/rest/media/v1/download_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-06-19 18:15:00 +0100
committerGitHub <noreply@github.com>2017-06-19 18:15:00 +0100
commit7d69f2d956774ad8608feeb80540b68e0e11b3fc (patch)
tree33ca83069a1a50b22815f3d67f551df79fca0c63 /synapse/rest/media/v1/download_resource.py
parentMerge pull request #2291 from matrix-org/erikj/shutdown_room (diff)
parentHandle thumbnail urls (diff)
downloadsynapse-7d69f2d956774ad8608feeb80540b68e0e11b3fc.tar.xz
Merge pull request #2292 from matrix-org/erikj/quarantine_media
Add API to quarantine media
Diffstat (limited to 'synapse/rest/media/v1/download_resource.py')
-rw-r--r--synapse/rest/media/v1/download_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py
index 6788375e85..39a286b83c 100644
--- a/synapse/rest/media/v1/download_resource.py
+++ b/synapse/rest/media/v1/download_resource.py
@@ -66,7 +66,7 @@ class DownloadResource(Resource):
     @defer.inlineCallbacks
     def _respond_local_file(self, request, media_id, name):
         media_info = yield self.store.get_local_media(media_id)
-        if not media_info:
+        if not media_info or media_info["quarantined_by"]:
             respond_404(request)
             return