hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/webfinger-mime-ld-json' into 'develop'

Browse source 
webfinger: handle application/ld+json links

See merge request pleroma/pleroma!159
This commit is contained in:
lambda 2018-05-19 09:31:08 +00:00
commit 7831b38705
4 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/web_finger/web_finger.ex
View file

@ -86,6 +86,11 @@ defmodule Pleroma.Web.WebFinger do
"href" => "data:application/magic-public-key,#{magic_key}"
},
%{"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)