diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-04 12:58:35 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-12-04 12:58:35 +0100 |
| commit | 24e692b0cf1e6b2c3f1f209bebb39f0f9a97eb20 (patch) | |
| tree | db50329a328b4841b1f71d908079c99eccb6d48e /app/views/api | |
| parent | 80c44ed9c19855d494ab26011dca0f6fbc644d0c (diff) | |
Set a specific S3 expiration time so that files can be cached
Diffstat (limited to 'app/views/api')
| -rw-r--r-- | app/views/api/v1/accounts/show.rabl | 4 | ||||
| -rw-r--r-- | app/views/api/v1/media/create.rabl | 4 | ||||
| -rw-r--r-- | app/views/api/v1/statuses/_media.rabl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl index a58db29b6..cd267eb00 100644 --- a/app/views/api/v1/accounts/show.rabl +++ b/app/views/api/v1/accounts/show.rabl @@ -4,8 +4,8 @@ attributes :id, :username, :acct, :display_name node(:note) { |account| Formatter.instance.simplified_format(account) } node(:url) { |account| TagManager.instance.url_for(account) } -node(:avatar) { |account| full_asset_url(account.avatar.expiring_url(3600, :original)) } -node(:header) { |account| full_asset_url(account.header.expiring_url(3600, :original)) } +node(:avatar) { |account| full_asset_url(account.avatar.expiring_url(s3_expiry, :original)) } +node(:header) { |account| full_asset_url(account.header.expiring_url(s3_expiry, :original)) } node(:followers_count) { |account| defined?(@followers_counts_map) ? (@followers_counts_map[account.id] || 0) : (account.try(:followers_count) || account.followers.count) } node(:following_count) { |account| defined?(@following_counts_map) ? (@following_counts_map[account.id] || 0) : (account.try(:following_count) || account.following.count) } node(:statuses_count) { |account| defined?(@statuses_counts_map) ? (@statuses_counts_map[account.id] || 0) : (account.try(:statuses_count) || account.statuses.count) } diff --git a/app/views/api/v1/media/create.rabl b/app/views/api/v1/media/create.rabl index 2a4db7aae..ba1a0c378 100644 --- a/app/views/api/v1/media/create.rabl +++ b/app/views/api/v1/media/create.rabl @@ -1,5 +1,5 @@ object @media attribute :id, :type -node(:url) { |media| full_asset_url(media.file.expiring_url(3600, :original)) } -node(:preview_url) { |media| full_asset_url(media.file.expiring_url(3600, :small)) } +node(:url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) } +node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) } node(:text_url) { |media| medium_url(media) } diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl index 76256ed2c..83b986d51 100644 --- a/app/views/api/v1/statuses/_media.rabl +++ b/app/views/api/v1/statuses/_media.rabl @@ -1,4 +1,4 @@ attributes :id, :remote_url, :type -node(:url) { |media| full_asset_url(media.file.expiring_url(3600, :original)) } -node(:preview_url) { |media| full_asset_url(media.file.expiring_url(3600, :small)) } +node(:url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) } +node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) } |