treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix media not being marked sensitive when outgoing CW is set 

Fixes #1461

Fixes a regression from a recent merge
lolsob-rspec
Thibaut Girka 2020-11-13 00:46:03 +01:00 committed by ThibG
parent 167ad14fbf
commit f613e4876a
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)
end
def sensitive
object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
end
def direct_message
object.direct_visibility?
end
@ -111,7 +107,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
end
def sensitive
object.account.sensitized? || object.sensitive
object.account.sensitized? || object.sensitive || (!instance_options[:allow_local_only] && Setting.outgoing_spoilers.present?)
end
def virtual_tags