diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-31 19:44:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 19:44:47 +0200 |
| commit | 147e90f35d9aadfbe15d044f3ce48be77e26968a (patch) | |
| tree | b8aad6a1a34cd897bdb187cdf1fb1cacf7ac721c /app/serializers | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | ef270ed0df5a247b77853610f2f108206828a67a (diff) | |
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 6 | ||||
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 0bd7aed2e..222e17c99 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -6,12 +6,14 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer context :security context_extensions :manually_approves_followers, :featured, :also_known_as, - :moved_to, :property_value, :hashtag, :emoji, :identity_proof + :moved_to, :property_value, :hashtag, :emoji, :identity_proof, + :discoverable attributes :id, :type, :following, :followers, :inbox, :outbox, :featured, :preferred_username, :name, :summary, - :url, :manually_approves_followers + :url, :manually_approves_followers, + :discoverable has_one :public_key, serializer: ActivityPub::PublicKeySerializer diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 3ecce8f0a..63b84a0b9 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -5,7 +5,7 @@ class REST::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, - :followers_count, :following_count, :statuses_count + :followers_count, :following_count, :statuses_count, :last_status_at has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested? has_many :emojis, serializer: REST::CustomEmojiSerializer |