about summary refs log tree commit diff
path: root/app/views/api/v1/accounts/show.rabl
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-04 12:58:35 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-04 12:58:35 +0100
commit24e692b0cf1e6b2c3f1f209bebb39f0f9a97eb20 (patch)
treedb50329a328b4841b1f71d908079c99eccb6d48e /app/views/api/v1/accounts/show.rabl
parent80c44ed9c19855d494ab26011dca0f6fbc644d0c (diff)
Set a specific S3 expiration time so that files can be cached
Diffstat (limited to 'app/views/api/v1/accounts/show.rabl')
-rw-r--r--app/views/api/v1/accounts/show.rabl4
1 files changed, 2 insertions, 2 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) }