about summary refs log tree commit diff
path: root/app/serializers/activitypub
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-08-17 17:23:41 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:18 -0500
commit48aa456eb0bd99e0a5ae99a51630597263579c2d (patch)
tree1e1a12c1d255bd1d3f4340bd0faa369b74ef2090 /app/serializers/activitypub
parentcf2342da7140c0b73b580756edfc3c78b8ea6063 (diff)
[Federation] Use plaintext article summaries for compat with standard Mastodon
Diffstat (limited to 'app/serializers/activitypub')
-rw-r--r--app/serializers/activitypub/note_serializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index b86ab932e..acadce1b2 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -55,7 +55,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
   end
 
   def summary
-    return Formatter.instance.format(object) if title_present?
+    return Formatter.instance.format(object, plaintext: true) || Setting.outgoing_spoilers.presence if title_present?
 
     object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
   end