From a89a613e4e070e09e0dd5d040060ace622aac6aa Mon Sep 17 00:00:00 2001 From: Lain Iwakura Date: Mon, 11 Dec 2017 18:20:41 +0100 Subject: [PATCH] ActivityPub: Use only string keys in views. --- .../web/activity_pub/views/user_view.ex | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex index 5303455a8..b3b02c4fb 100644 --- a/lib/pleroma/web/activity_pub/views/user_view.ex +++ b/lib/pleroma/web/activity_pub/views/user_view.ex @@ -8,43 +8,43 @@ def render("user.json", %{user: user}) do public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key) public_key = :public_key.pem_encode([public_key]) %{ - "@context": [ + "@context" => [ "https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1", %{ - "manuallyApprovesFollowers": "as:manuallyApprovesFollowers", - "sensitive": "as:sensitive", - "Hashtag": "as:Hashtag", - "ostatus": "http://ostatus.org#", - "atomUri": "ostatus:atomUri", - "inReplyToAtomUri": "ostatus:inReplyToAtomUri", - "conversation": "ostatus:conversation", - "toot": "http://joinmastodon.org/ns#", - "Emoji": "toot:Emoji" + "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers", + "sensitive" => "as:sensitive", + "Hashtag" => "as:Hashtag", + "ostatus" => "http://ostatus.org#", + "atomUri" => "ostatus:atomUri", + "inReplyToAtomUri" => "ostatus:inReplyToAtomUri", + "conversation" => "ostatus:conversation", + "toot" => "http://joinmastodon.org/ns#", + "Emoji" => "toot:Emoji" } ], - "id": user.ap_id, - "type": "Person", - "following": "#{user.ap_id}/following", - "followers": "#{user.ap_id}/followers", - "inbox": "#{user.ap_id}/inbox", - "outbox": "#{user.ap_id}/outbox", - "preferredUsername": user.nickname, - "name": user.name, - "summary": user.bio, - "url": user.ap_id, - "manuallyApprovesFollowers": false, - "publicKey": %{ - "id": "#{user.ap_id}#main-key", - "owner": user.ap_id, - "publicKeyPem": public_key + "id" => user.ap_id, + "type" => "Person", + "following" => "#{user.ap_id}/following", + "followers" => "#{user.ap_id}/followers", + "inbox" => "#{user.ap_id}/inbox", + "outbox" => "#{user.ap_id}/outbox", + "preferredUsername" => user.nickname, + "name" => user.name, + "summary" => user.bio, + "url" => user.ap_id, + "manuallyApprovesFollowers" => false, + "publicKey" => %{ + "id" => "#{user.ap_id}#main-key", + "owner" => user.ap_id, + "publicKeyPem" => public_key }, - "endpoints": %{ - "sharedInbox": "#{Pleroma.Web.Endpoint.url}/inbox" + "endpoints" => %{ + "sharedInbox" => "#{Pleroma.Web.Endpoint.url}/inbox" }, - "icon": %{ - "type": "Image", - "url": User.avatar_url(user) + "icon" => %{ + "type" => "Image", + "url" => User.avatar_url(user) } } end