A lot of fixes from a live test

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

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

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