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/accounts | |
| parent | 80c44ed9c19855d494ab26011dca0f6fbc644d0c (diff) | |
Set a specific S3 expiration time so that files can be cached
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_grid_card.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/_header.html.haml | 4 | ||||
| -rw-r--r-- | app/views/accounts/show.atom.ruby | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml index d91c18476..d0f1ae3d4 100644 --- a/app/views/accounts/_grid_card.html.haml +++ b/app/views/accounts/_grid_card.html.haml @@ -1,6 +1,6 @@ .account-grid-card .account-grid-card__header - .avatar= image_tag account.avatar.expiring_url(3600, :original) + .avatar= image_tag account.avatar.expiring_url(s3_expiry, :original) .name = link_to TagManager.instance.url_for(account) do %span.display_name= display_name(account) diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 4c7d53678..7c483e790 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,4 +1,4 @@ -.card{ style: "background-image: url(#{@account.header.expiring_url(3600, :original)})" } +.card{ style: "background-image: url(#{@account.header.expiring_url(s3_expiry, :original)})" } - if user_signed_in? && current_account.id != @account.id .controls - if current_account.following?(@account) @@ -6,7 +6,7 @@ - else = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button' - .avatar= image_tag @account.avatar.expiring_url(3600, :original) + .avatar= image_tag @account.avatar.expiring_url(s3_expiry, :original) %h1.name = display_name(@account) %small= "@#{@account.username}" diff --git a/app/views/accounts/show.atom.ruby b/app/views/accounts/show.atom.ruby index 68b1c157d..2fcaecdce 100644 --- a/app/views/accounts/show.atom.ruby +++ b/app/views/accounts/show.atom.ruby @@ -6,7 +6,7 @@ Nokogiri::XML::Builder.new do |xml| title xml, @account.display_name subtitle xml, @account.note updated_at xml, stream_updated_at - logo xml, full_asset_url(@account.avatar.expiring_url(3600, :original)) + logo xml, full_asset_url(@account.avatar.expiring_url(s3_expiry, :original)) author(xml) do include_author xml, @account |