diff options
author | Erik Johnston <erikj@jki.re> | 2017-06-23 12:00:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 12:00:45 +0100 |
commit | 4fec80ba6fb89ad4f2e527dbaea6c0c2ec9aa4b6 (patch) | |
tree | a2bd30b908118a6e9dff04259e7e2b54d6d6b44a /synapse/storage/media_repository.py | |
parent | Merge pull request #2297 from matrix-org/erikj/user_dir_fix (diff) | |
parent | Store URL cache preview downloads seperately (diff) | |
download | synapse-4fec80ba6fb89ad4f2e527dbaea6c0c2ec9aa4b6.tar.xz |
Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads
Store URL cache preview downloads separately
Diffstat (limited to 'synapse/storage/media_repository.py')
-rw-r--r-- | synapse/storage/media_repository.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py index 5f0f18ee66..82bb61b811 100644 --- a/synapse/storage/media_repository.py +++ b/synapse/storage/media_repository.py @@ -30,13 +30,16 @@ class MediaRepositoryStore(SQLBaseStore): return self._simple_select_one( "local_media_repository", {"media_id": media_id}, - ("media_type", "media_length", "upload_name", "created_ts", "quarantined_by"), + ( + "media_type", "media_length", "upload_name", "created_ts", + "quarantined_by", "url_cache", + ), allow_none=True, desc="get_local_media", ) def store_local_media(self, media_id, media_type, time_now_ms, upload_name, - media_length, user_id): + media_length, user_id, url_cache=None): return self._simple_insert( "local_media_repository", { @@ -46,6 +49,7 @@ class MediaRepositoryStore(SQLBaseStore): "upload_name": upload_name, "media_length": media_length, "user_id": user_id.to_string(), + "url_cache": url_cache, }, desc="store_local_media", ) |