1 files changed, 7 insertions, 3 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 3d99e29c4..163f25560 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -51,6 +51,8 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def summary
+    return Formatter.instance.format(object) if title_present?
+
     object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
   end
 
@@ -67,11 +69,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def content
-    Formatter.instance.format(object)
+    Formatter.instance.format(object, article_content: true)
   end
 
   def content_map
-    { object.language => Formatter.instance.format(object) }
+    { object.language => Formatter.instance.format(object, article_content: true) }
   end
 
   def replies
@@ -193,7 +195,9 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def title_present?
-    object.title.present?
+    return @has_title if defined?(@has_title)
+
+    @has_title = object.title.present?
   end
 
   def server_metadata