diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-19 09:31:08 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-19 09:31:08 +0000 |
| commit | 7831b38705654d77bddd14b0f4542b9ae7e9e82d (patch) | |
| tree | 7abedd33e3135a4c192eae323764ada17286f19a /lib | |
| parent | ad563669c891120f8ff5e416c7ef3d60c831da26 (diff) | |
| parent | 725b05d04aecaa00d5b79c81958267444bf3c91d (diff) | |
| download | pleroma-7831b38705654d77bddd14b0f4542b9ae7e9e82d.tar.gz pleroma-7831b38705654d77bddd14b0f4542b9ae7e9e82d.zip | |
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/web_finger/web_finger.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex index 6ffa80a43..6e5fc1401 100644 --- a/lib/pleroma/web/web_finger/web_finger.ex +++ b/lib/pleroma/web/web_finger/web_finger.ex @@ -87,6 +87,11 @@ defmodule Pleroma.Web.WebFinger do }, %{"rel" => "self", "type" => "application/activity+json", "href" => user.ap_id}, %{ + "rel" => "self", + "type" => "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", + "href" => user.ap_id + }, + %{ "rel" => "http://ostatus.org/schema/1.0/subscribe", "template" => OStatus.remote_follow_path() } @@ -183,6 +188,9 @@ defmodule Pleroma.Web.WebFinger do {"application/activity+json", "self"} -> Map.put(data, "ap_id", link["href"]) + {"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", "self"} -> + Map.put(data, "ap_id", link["href"]) + {_, "magic-public-key"} -> "data:application/magic-public-key," <> magic_key = link["href"] Map.put(data, "magic_key", magic_key) |