diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 13:27:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 13:27:40 +0100 |
commit | ee7e49d1b1323618e16026bc8db8ab7f9459cc2d (patch) | |
tree | 86d51ac7c13d2b08fae534a44524c2ef8b131315 /app/serializers/rest/admin/account_serializer.rb | |
parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
parent | c4d2c729245fab1dda31d0de73be9bc03217b06a (diff) |
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/rest/admin/account_serializer.rb')
-rw-r--r-- | app/serializers/rest/admin/account_serializer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/rest/admin/account_serializer.rb b/app/serializers/rest/admin/account_serializer.rb index 2fbc7b1cb..ad98a53e8 100644 --- a/app/serializers/rest/admin/account_serializer.rb +++ b/app/serializers/rest/admin/account_serializer.rb @@ -3,7 +3,7 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :domain, :created_at, :email, :ip, :role, :confirmed, :suspended, - :silenced, :disabled, :approved, :locale, + :silenced, :sensitized, :disabled, :approved, :locale, :invite_request attribute :created_by_application_id, if: :created_by_application? @@ -32,6 +32,10 @@ class REST::Admin::AccountSerializer < ActiveModel::Serializer object.silenced? end + def sensitized + object.sensitized? + end + def confirmed object.user_confirmed? end |