fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-30 16:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup archive including outgoing-only content warnings

Browse source
This commit is contained in:
Thibaut Girka 2020-05-30 16:56:23 +02:00 committed by ThibG
parent 9e04b9d8df
commit ddcd9fe9f0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/serializers/activitypub/note_serializer.rb
View file

@ -35,11 +35,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
end end
def summary def summary
object.spoiler_text.presence || Setting.outgoing_spoilers.presence object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
end end
def sensitive def sensitive
object.sensitive || Setting.outgoing_spoilers.present? object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
end end
def content def content