diff options
| author | Erik Johnston <erik@matrix.org> | 2017-09-28 12:37:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-09-28 12:37:53 +0100 |
| commit | ae79764fe55ab15156b4f28658326bd2c9c0b937 (patch) | |
| tree | ba96aced53980f87ec119722983bc5942260b5de /synapse/rest/media | |
| parent | More brackets (diff) | |
| download | synapse-ae79764fe55ab15156b4f28658326bd2c9c0b937.tar.xz | |
Change expires column to expires_ts
Diffstat (limited to 'synapse/rest/media')
| -rw-r--r-- | synapse/rest/media/v1/preview_url_resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/preview_url_resource.py b/synapse/rest/media/v1/preview_url_resource.py index c5ba83ddfd..6f896ffb53 100644 --- a/synapse/rest/media/v1/preview_url_resource.py +++ b/synapse/rest/media/v1/preview_url_resource.py @@ -137,7 +137,7 @@ class PreviewUrlResource(Resource): cache_result = yield self.store.get_url_cache(url, ts) if ( cache_result and - cache_result["download_ts"] + cache_result["expires"] > ts and + cache_result["expires_ts"] > ts and cache_result["response_code"] / 100 == 2 ): respond_with_json_bytes( @@ -246,7 +246,7 @@ class PreviewUrlResource(Resource): url, media_info["response_code"], media_info["etag"], - media_info["expires"], + media_info["expires"] + media_info["created_ts"], json.dumps(og), media_info["filesystem_id"], media_info["created_ts"], |