diff options
author | ThibG <thib@sitedethib.com> | 2019-09-06 12:06:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-06 12:06:59 +0200 |
commit | 286bf110c3e69042049968440f1eb99372a7e0e6 (patch) | |
tree | ddf1c32803022cb200087a8c4c6818612ca76d3b /app/serializers/activitypub/actor_serializer.rb | |
parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
parent | 4434e2eb7f9942b44561c2f7702af3ed3854b8db (diff) |
Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/activitypub/actor_serializer.rb')
-rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 222e17c99..17df85de3 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -6,7 +6,7 @@ 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, :identity_proof, :discoverable attributes :id, :type, :following, :followers, @@ -138,6 +138,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer end class TagSerializer < ActivityPub::Serializer + context_extensions :hashtag + include RoutingHelper attributes :type, :href, :name |