aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-03-21 18:06:41 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-03-22 00:36:01 -0500
commit1decd2ecb2d1c89ddb29067b2128558c84ce1f86 (patch)
tree6c97229e54622b4b5e0776ad3c61194cb62f30ad /lib
parent8aa639a450c94fc3fb8ea812b334892324ffd51a (diff)
downloadpleroma-1decd2ecb2d1c89ddb29067b2128558c84ce1f86.tar.gz
webfinger: attempt to fall back if LRDD template cannot be found
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 378e544ba..de4165bb3 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -146,9 +146,14 @@ defmodule Pleroma.Web.WebFinger do
URI.parse(account).host
end
- with {:ok, template} <- find_lrdd_template(domain),
- address <- String.replace(template, "{uri}", URI.encode(account)),
- response <- @httpoison.get(address, ["Accept": "application/xrd+xml"]),
+ case find_lrdd_template(domain) do
+ {:ok, template} ->
+ address = String.replace(template, "{uri}", URI.encode(account))
+ _ ->
+ address = "http://#{domain}/.well-known/webfinger?resource=#{account}"
+ end
+
+ with response <- @httpoison.get(address, ["Accept": "application/xrd+xml"]),
{:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
doc when doc != :error<- XML.parse_document(body),
{:ok, data} <- webfinger_from_xml(doc) do