From 24e692b0cf1e6b2c3f1f209bebb39f0f9a97eb20 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 4 Dec 2016 12:58:35 +0100 Subject: Set a specific S3 expiration time so that files can be cached --- app/views/api/v1/accounts/show.rabl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/api/v1/accounts/show.rabl') 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) } -- cgit