diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-19 17:39:21 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-19 17:39:21 +0100 |
commit | b8b936a6eab46cec2460fb723124bb3a750d3c83 (patch) | |
tree | dfc75e117404bff0055300277857c4d681cdf225 /synapse/storage/media_repository.py | |
parent | Handle all cases of sending membership events (diff) | |
download | synapse-b8b936a6eab46cec2460fb723124bb3a750d3c83.tar.xz |
Add API to quarantine media
Diffstat (limited to 'synapse/storage/media_repository.py')
-rw-r--r-- | synapse/storage/media_repository.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py index 4c0f82353d..5f0f18ee66 100644 --- a/synapse/storage/media_repository.py +++ b/synapse/storage/media_repository.py @@ -30,7 +30,7 @@ class MediaRepositoryStore(SQLBaseStore): return self._simple_select_one( "local_media_repository", {"media_id": media_id}, - ("media_type", "media_length", "upload_name", "created_ts"), + ("media_type", "media_length", "upload_name", "created_ts", "quarantined_by"), allow_none=True, desc="get_local_media", ) @@ -138,7 +138,7 @@ class MediaRepositoryStore(SQLBaseStore): {"media_origin": origin, "media_id": media_id}, ( "media_type", "media_length", "upload_name", "created_ts", - "filesystem_id", + "filesystem_id", "quarantined_by", ), allow_none=True, desc="get_cached_remote_media", |