Fix media not being marked sensitive when outgoing CW is set
Fixes #1461 Fixes a regression from a recent merge
This commit is contained in:
parent
265b26489a
commit
339f78fb63
|
@ -40,10 +40,6 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
|
||||||
object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
|
object.spoiler_text.presence || (instance_options[:allow_local_only] ? nil : Setting.outgoing_spoilers.presence)
|
||||||
end
|
end
|
||||||
|
|
||||||
def sensitive
|
|
||||||
object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
|
|
||||||
end
|
|
||||||
|
|
||||||
def direct_message
|
def direct_message
|
||||||
object.direct_visibility?
|
object.direct_visibility?
|
||||||
end
|
end
|
||||||
|
@ -111,7 +107,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
|
||||||
end
|
end
|
||||||
|
|
||||||
def sensitive
|
def sensitive
|
||||||
object.account.sensitized? || object.sensitive
|
object.account.sensitized? || object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
|
||||||
end
|
end
|
||||||
|
|
||||||
def virtual_tags
|
def virtual_tags
|
||||||
|
|
Loading…
Reference in New Issue