aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-05-19 06:15:21 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-05-19 01:28:19 -0500
commit1a250d65afa6de25c3395fa1fad0e1d57e9ee1d2 (patch)
tree200746db117764ebdb3a8ec26f085cbc14578a3a /lib
parentd1f6ecf607954e725e72b8e91be5f969eebe997f (diff)
downloadpleroma-1a250d65afa6de25c3395fa1fad0e1d57e9ee1d2.tar.gz
webfinger: only do ld+json on modern json webfinger
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index b955bc43f..3744dd62f 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -118,7 +118,6 @@ defmodule Pleroma.Web.WebFinger do
{:Link,
%{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/ld+json; profile=&quot;https://www.w3.org/ns/activitystreams&quot;", href: user.ap_id}},
{:Link,
%{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
]
@@ -166,14 +165,6 @@ defmodule Pleroma.Web.WebFinger do
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 = %{
"magic_key" => magic_key,
"topic" => topic,