From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 21 Mar 2018 18:06:41 +0000 (+0000)
Subject: webfinger: attempt to fall back if LRDD template cannot be found
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1decd2ecb2d1c89ddb29067b2128558c84ce1f86;p=akkoma

webfinger: attempt to fall back if LRDD template cannot be found
---

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