diff options
| author | Erik Johnston <erikj@jki.re> | 2017-06-19 18:15:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 18:15:00 +0100 |
| commit | 7d69f2d956774ad8608feeb80540b68e0e11b3fc (patch) | |
| tree | 33ca83069a1a50b22815f3d67f551df79fca0c63 /synapse/storage/media_repository.py | |
| parent | Merge pull request #2291 from matrix-org/erikj/shutdown_room (diff) | |
| parent | Handle thumbnail urls (diff) | |
| download | synapse-7d69f2d956774ad8608feeb80540b68e0e11b3fc.tar.xz | |
Merge pull request #2292 from matrix-org/erikj/quarantine_media
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", |