about summary refs log tree commit diff
path: root/app/serializers/activitypub/actor_serializer.rb
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-17 20:03:57 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-17 20:03:57 +0200
commitc727eae4412ac9e4f1bafdc68fe89dcd46d602ca (patch)
treeee7ce8662f6a91c87cf46bf6de70dae66556c0d0 /app/serializers/activitypub/actor_serializer.rb
parentd0aad1ac854eaa53f9b7d38cc8dd90e289790629 (diff)
parent681c33d1f4c395742918eb66f2db979b0d628118 (diff)
Updated from tootsuite
Diffstat (limited to 'app/serializers/activitypub/actor_serializer.rb')
-rw-r--r--app/serializers/activitypub/actor_serializer.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 56806152e..f5e626d73 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -7,6 +7,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
              :inbox, :outbox, :preferred_username,
              :name, :summary, :icon, :image
 
+  has_one :public_key, serializer: ActivityPub::PublicKeySerializer
+
   def id
     account_url(object)
   end
@@ -50,4 +52,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   def image
     full_asset_url(object.header.url(:original))
   end
+
+  def public_key
+    object
+  end
 end