fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-27 18:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix media not being marked sensitive when outgoing CW is set

Browse source 
Fixes #1461

Fixes a regression from a recent merge
This commit is contained in:
Thibaut Girka 2020-11-13 00:46:03 +01:00 committed by ThibG
parent 265b26489a
commit 339f78fb63
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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