diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-05 11:36:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-05 11:36:41 +0200 |
| commit | 5088eb8388fbfcb210a518f918ae5332e6d3979e (patch) | |
| tree | 20b9394200b79e7eefc234cc50b0f3650e9afc1d /app/serializers/activitypub/actor_serializer.rb | |
| parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
| parent | e265b8887dbd883bc7ca04832dc67ffe46966889 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 |