From e54e592d6c1d0ff5de5a029ae1fccee447f97149 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 1 May 2017 13:51:17 +0200
Subject: [PATCH] Return webfinger for ap_ids.

---
 lib/pleroma/web/web_finger/web_finger.ex | 12 ++++++++----
 test/web/web_finger/web_finger_test.exs  | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 7ceca042b..f8f4d5e42 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -18,11 +18,15 @@ def host_meta() do
   def webfinger(resource) do
     host = Pleroma.Web.host
     regex = ~r/(acct:)?(?<username>\w+)@#{host}/
-    case Regex.named_captures(regex, resource) do
-      %{"username" => username} ->
-        user = User.get_by_nickname(username)
+    with %{"username" => username} <- Regex.named_captures(regex, resource) do
+      user = User.get_by_nickname(username)
+      {:ok, represent_user(user)}
+    else _e ->
+      with user when not is_nil(user) <- User.get_cached_by_ap_id(resource) do
         {:ok, represent_user(user)}
-      _ -> nil
+      else _e ->
+        {:error, "Couldn't find user"}
+      end
     end
   end
 
diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs
index 303abe529..b48fdd0aa 100644
--- a/test/web/web_finger/web_finger_test.exs
+++ b/test/web/web_finger/web_finger_test.exs
@@ -11,6 +11,22 @@ test "returns a link to the xml lrdd" do
     end
   end
 
+  describe "incoming webfinger request" do
+    test "works for fqns" do
+      user = insert(:user)
+
+      {:ok, result} = WebFinger.webfinger("#{user.nickname}@#{Pleroma.Web.host}")
+      assert is_binary(result)
+    end
+
+    test "works for ap_ids" do
+      user = insert(:user)
+
+      {:ok, result} = WebFinger.webfinger(user.ap_id)
+      assert is_binary(result)
+    end
+  end
+
   describe "fingering" do
     test "returns the info for a user" do
       user = "shp@social.heldscal.la"