diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-12 17:42:53 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:39:08 -0600 |
| commit | f60e0b62f4e5300645f235983e5b75bcf16b370d (patch) | |
| tree | 0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /app/serializers/rest/status_serializer.rb | |
| parent | ec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff) | |
| parent | 265b26489a9214a6c98a4dfa88f08ce490211ebc (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/serializers/rest/status_serializer.rb')
| -rw-r--r-- | app/serializers/rest/status_serializer.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb index 39d812185..4433713a7 100644 --- a/app/serializers/rest/status_serializer.rb +++ b/app/serializers/rest/status_serializer.rb @@ -87,6 +87,14 @@ class REST::StatusSerializer < ActiveModel::Serializer end end + def sensitive + if current_user? && current_user.account_id == object.account_id + object.sensitive + else + object.account.sensitized? || object.sensitive + end + end + def uri ActivityPub::TagManager.instance.uri_for(object) end |