about summary refs log tree commit diff
path: root/app/views/api/v1/accounts
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-04 13:02:43 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-04 13:02:43 +0100
commitf763e844e8e703891ada1bc44047e4e043007c68 (patch)
tree58918dd2d85a943a4a97960a3fdfc8348970542c /app/views/api/v1/accounts
parent24e692b0cf1e6b2c3f1f209bebb39f0f9a97eb20 (diff)
Do not use expiring links after all
Diffstat (limited to 'app/views/api/v1/accounts')
-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 cd267eb00..22cb87f6c 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(s3_expiry, :original)) }
-node(:header)          { |account| full_asset_url(account.header.expiring_url(s3_expiry, :original)) }
+node(:avatar)          { |account| full_asset_url(account.avatar.url( :original)) }
+node(:header)          { |account| full_asset_url(account.header.url( :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) }