Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add account sensitized (#14361)

Browse source 
* Add account sensitized

* Fix i18n normalize

* Fix description and spec

* Fix spec

* Fix wording
This commit is contained in:
Takeshi Umeda 2020-11-05 04:45:01 +09:00 • committed by GitHub
parent f90620b2f3
commit d6fe0c94ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 136 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,6 +95,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
ActivityPub::TagManager.instance.cc(object)
end
def sensitive
object.account.sensitized? || object.sensitive
end
def virtual_tags
object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
end

8
app/serializers/rest/status_serializer.rb
View file

@ -58,6 +58,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