diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 15:46:29 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-28 15:46:29 +0100 |
| commit | 47d50b0e3967f1d396bdbe8ea3e8909ce2be599f (patch) | |
| tree | 07b076154cbe66f2d1a31dbb9662892fb24c8156 /app/helpers | |
| parent | f1654da7ad11920979d335798cfeef2e88118c1b (diff) | |
A lot of fixes from a live test
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 8 | ||||
| -rw-r--r-- | app/helpers/profile_helper.rb | 8 | ||||
| -rw-r--r-- | app/helpers/routing_helper.rb | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4c65a78bb..90b45a025 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -22,6 +22,14 @@ module ApplicationHelper add_base_url_prefix salmon_path(id: account.id, format: '') end + def profile_url(account) + account.local? ? super(name: account.username) : account.url + end + + def status_url(status) + status.local? ? super(name: status.account.username, id: status.stream_entry.id) : status.url + end + def add_base_url_prefix(suffix) File.join(root_url, "api", suffix) end diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index cb19638d3..3a34dfbd8 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -3,14 +3,6 @@ module ProfileHelper account.display_name.blank? ? account.username : account.display_name end - def profile_url(account) - account.local? ? super(name: account.username) : account.url - end - - def status_url(status) - status.local? ? super(name: status.account.username, id: status.stream_entry.id) : status.url - end - def avatar_for_status_url(status) status.reblog? ? status.reblog.account.avatar.url(:small) : status.account.avatar.url(:small) end diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb index 655e6bc26..390602623 100644 --- a/app/helpers/routing_helper.rb +++ b/app/helpers/routing_helper.rb @@ -2,6 +2,7 @@ module RoutingHelper extend ActiveSupport::Concern include Rails.application.routes.url_helpers include GrapeRouteHelpers::NamedRouteMatcher + include ActionView::Helpers::AssetUrlHelper included do def default_url_options |