Fix backup archive including outgoing-only content warnings
parent
9e04b9d8df
commit
ddcd9fe9f0
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue