move icon helpers to InstanceHelper

mastodon · May 19, 2024 · 82c37c9 · 82c37c9
1 parent 552d168
commit 82c37c9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -244,18 +244,6 @@ def mascot_url
     full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
-  def instance_presenter
-    @instance_presenter ||= InstancePresenter.new
-  end
-
-  def favicon_path(size = '48')
-    instance_presenter.favicon&.file&.url(size)
-  end
-
-  def app_icon_path(size = '48')
-    instance_presenter.app_icon&.file&.url(size)
-  end
-
   private
 
   def storage_host_var

diff --git a/app/helpers/instance_helper.rb b/app/helpers/instance_helper.rb
@@ -13,6 +13,18 @@ def description_for_sign_up(invite = nil)
     safe_join([description_prefix(invite), I18n.t('auth.description.suffix')], ' ')
   end
 
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+
+  def favicon_path(size = '48')
+    instance_presenter.favicon&.file&.url(size)
+  end
+
+  def app_icon_path(size = '48')
+    instance_presenter.app_icon&.file&.url(size)
+  end
+
   private
 
   def description_prefix(invite)

diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
@@ -8,7 +8,6 @@ class ContactSerializer < ActiveModel::Serializer
   end
 
   include InstanceHelper
-  include ApplicationHelper
   include RoutingHelper
 
   attributes :domain, :title, :version, :source_url, :description,