about summary refs log tree commit diff
path: root/app/views/api
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/api')
-rw-r--r--app/views/api/v1/accounts/show.rabl4
-rw-r--r--app/views/api/v1/media/create.rabl4
-rw-r--r--app/views/api/v1/statuses/_media.rabl4
3 files changed, 6 insertions, 6 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) }
diff --git a/app/views/api/v1/media/create.rabl b/app/views/api/v1/media/create.rabl
index ba1a0c378..0b42e6e3d 100644
--- a/app/views/api/v1/media/create.rabl
+++ b/app/views/api/v1/media/create.rabl
@@ -1,5 +1,5 @@
 object @media
 attribute :id, :type
-node(:url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) }
-node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) }
+node(:url) { |media| full_asset_url(media.file.url( :original)) }
+node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }
 node(:text_url) { |media| medium_url(media) }
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
index 83b986d51..af635dfec 100644
--- a/app/views/api/v1/statuses/_media.rabl
+++ b/app/views/api/v1/statuses/_media.rabl
@@ -1,4 +1,4 @@
 attributes :id, :remote_url, :type
 
-node(:url)         { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) }
-node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) }
+node(:url)         { |media| full_asset_url(media.file.url( :original)) }
+node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }