diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 762a972ec..be82ff2fe 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,8 +4,4 @@ module ApplicationHelper def active_nav_class(path) current_page?(path) ? 'active' : '' end - - def s3_expiry - Time.zone.now.beginning_of_day.since 25.hours - end end diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 6a8e67040..0aa7008be 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -6,7 +6,7 @@ module StreamEntriesHelper end def avatar_for_status_url(status) - status.reblog? ? status.reblog.account.avatar.expiring_url(s3_expiry, :original) : status.account.avatar.expiring_url(s3_expiry, :original) + status.reblog? ? status.reblog.account.avatar.url( :original) : status.account.avatar.url( :original) end def entry_classes(status, is_predecessor, is_successor, include_threads) |