diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-07 17:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 17:43:42 +0200 |
| commit | 3a3475450e46f670e8beaf4bf804b820ad39a5f9 (patch) | |
| tree | 60600a840e74668818db64d5d55be2f4a0601fb3 /app/serializers/activitypub/actor_serializer.rb | |
| parent | 057db0ecd0049c76c113cbe5412e098d686f0700 (diff) | |
Encode custom emojis as resolveable objects in ActivityPub (#5243)
* Encode custom emojis as resolveable objects in ActivityPub
* Improve code style
Diffstat (limited to 'app/serializers/activitypub/actor_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index a11178f5bae..896d67115a5 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -10,20 +10,6 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer has_one :public_key, serializer: ActivityPub::PublicKeySerializer - class ImageSerializer < ActiveModel::Serializer - include RoutingHelper - - attributes :type, :url - - def type - 'Image' - end - - def url - full_asset_url(object.url(:original)) - end - end - class EndpointsSerializer < ActiveModel::Serializer include RoutingHelper @@ -36,8 +22,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer has_one :endpoints, serializer: EndpointsSerializer - has_one :icon, serializer: ImageSerializer, if: :avatar_exists? - has_one :image, serializer: ImageSerializer, if: :header_exists? + has_one :icon, serializer: ActivityPub::ImageSerializer, if: :avatar_exists? + has_one :image, serializer: ActivityPub::ImageSerializer, if: :header_exists? def id account_url(object) |