Merge 9854eab7d6 into a50c8e951f

app/helpers/settings_helper.rb

@@ -50,7 +50,7 @@ module SettingsHelper
 
   def post_link_to_featured_tag(tag)
     link_to(
-      "##{tag.display_name}",
+      tag.formatted_name,
       settings_featured_tags_path(featured_tag: { name: tag.name }),
       method: :post
     )

app/models/featured_tag.rb

@@ -40,6 +40,10 @@ class FeaturedTag < ApplicationRecord
     attributes['name'] || tag.display_name
   end
 
+  def formatted_name
+    "##{attributes['name']}" || tag.formatted_name
+  end
+
   def increment(timestamp)
     update(statuses_count: statuses_count + 1, last_status_at: timestamp)
   end

app/serializers/activitypub/actor_serializer.rb

@@ -186,7 +186,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     end
 
     def name
-      "##{object.name}"
+      object.formatted_name
     end
   end
 

app/serializers/activitypub/hashtag_serializer.rb

@@ -12,7 +12,7 @@ class ActivityPub::HashtagSerializer < ActivityPub::Serializer
   end
 
   def name
-    "##{object.display_name}"
+    object.formatted_name
   end
 
   def href

app/serializers/activitypub/note_serializer.rb

@@ -269,7 +269,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
 
     def name
-      "##{object.name}"
+      object.formatted_name
     end
   end