diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-08 21:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 21:27:36 +0100 |
| commit | 246addd5b33a172600342af3fb6fb5e4c80ad95e (patch) | |
| tree | 98b87efd3f5f3d41d75482707924fde708c074ec /app/serializers | |
| parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
| parent | 49027ee948bc76cc89214f8f340d353763796f1d (diff) | |
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 17df85de3..aa64936a7 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -49,6 +49,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer 'Application' elsif object.bot? 'Service' + elsif object.group? + 'Group' else 'Person' end diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 63b84a0b9..7bdb5d7ff 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -3,7 +3,7 @@ class REST::AccountSerializer < ActiveModel::Serializer include RoutingHelper - attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at, + attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, :followers_count, :following_count, :statuses_count, :last_status_at |