AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 91
Code Issues 175 Pull requests 22 Projects 2 Releases 14 Packages Wiki Activity

webfinger: only do ld+json on modern json webfinger

Browse source
This commit is contained in:
William Pitcock 2018-05-19 06:15:21 +00:00
parent d1f6ecf607
commit 1a250d65af
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,7 +118,6 @@ def represent_user(user, "XML") do
{:Link, {:Link,
%{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}}, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
{:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}}, {:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}},
{:Link, %{rel: "self", type: "application/ld+json; profile="https://www.w3.org/ns/activitystreams"", href: user.ap_id}},
{:Link, {:Link,
%{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}} %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
] ]
@ -166,14 +165,6 @@ defp webfinger_from_xml(doc) do
doc doc
) )
if ap_id == nil do
ap_id =
XML.string_from_xpath(
~s{//Link[@rel="self" and @type="application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""]/@href},
doc
)
end
data = %{ data = %{
"magic_key" => magic_key, "magic_key" => magic_key,
"topic" => topic, "topic" => topic,