Do not use expiring links after all

This commit is contained in:
Eugen Rochko 2016-12-04 13:02:43 +01:00
parent 24e692b0cf
commit f763e844e8
11 changed files with 13 additions and 18 deletions

View file

@ -1,6 +1,6 @@
.account-grid-card
.account-grid-card__header
.avatar= image_tag account.avatar.expiring_url(s3_expiry, :original)
.avatar= image_tag account.avatar.url( :original)
.name
= link_to TagManager.instance.url_for(account) do
%span.display_name= display_name(account)

View file

@ -1,4 +1,4 @@
.card{ style: "background-image: url(#{@account.header.expiring_url(s3_expiry, :original)})" }
.card{ style: "background-image: url(#{@account.header.url( :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(s3_expiry, :original)
.avatar= image_tag @account.avatar.url( :original)
%h1.name
= display_name(@account)
%small= "@#{@account.username}"

View file

@ -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(s3_expiry, :original))
logo xml, full_asset_url(@account.avatar.url( :original))
author(xml) do
include_author xml, @account