3 files changed, 26 insertions, 5 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 89b482592..90be86755 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -5,6 +5,7 @@ defmodule Pleroma.Web.OStatus do
 
   alias Pleroma.{Repo, User, Web}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.{WebFinger, Websub}
 
   def feed_path(user) do
     "#{user.ap_id}/feed.atom"
@@ -134,4 +135,14 @@ defmodule Pleroma.Web.OStatus do
       nil
     end
   end
+
+  def gather_user_info(username) do
+    with {:ok, webfinger_data} <- WebFinger.finger(username),
+         {:ok, feed_data} <- Websub.gather_feed_data(webfinger_data.topic) do
+      {:ok, Map.merge(webfinger_data, feed_data) |> Map.put(:fqn, username)}
+    else e ->
+      Logger.debug("Couldn't gather info for #{username}")
+      {:error, e}
+    end
+  end
 end
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 08ff6d278..1d8c4d0c8 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.WebFinger do
 
   def webfinger(resource) do
     host = Pleroma.Web.host
-    regex = ~r/acct:(?<username>\w+)@#{host}/
+    regex = ~r/(acct:)?(?<username>\w+)@#{host}/
     case Regex.named_captures(regex, resource) do
       %{"username" => username} ->
         user = User.get_cached_by_nickname(username)
@@ -70,7 +70,7 @@ defmodule Pleroma.Web.WebFinger do
     else
       e ->
         Logger.debug("Couldn't finger #{account}.")
-        Logger.debug(e)
+        Logger.debug(inspect(e))
         {:error, e}
     end
   end
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index ad9e47b46..c1d48ad7a 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -121,14 +121,24 @@ defmodule Pleroma.Web.Websub do
     requester.(subscription)
   end
 
-  def discover(topic, getter \\ &HTTPoison.get/1) do
+  def gather_feed_data(topic, getter \\ &HTTPoison.get/1) do
     with {:ok, response} <- getter.(topic),
          status_code when status_code in 200..299 <- response.status_code,
          body <- response.body,
          doc <- XML.parse_document(body),
-         url when not is_nil(url) <- XML.string_from_xpath(~S{/feed/link[@rel="self"]/@href}, doc),
+         uri when not is_nil(uri) <- XML.string_from_xpath("/feed/author[1]/uri", doc),
          hub when not is_nil(hub) <- XML.string_from_xpath(~S{/feed/link[@rel="hub"]/@href}, doc) do
-      {:ok, %{url: url, hub: hub}}
+
+      name = XML.string_from_xpath("/feed/author[1]/name", doc)
+      preferredUsername = XML.string_from_xpath("/feed/author[1]/poco:preferredUsername", doc)
+      displayName = XML.string_from_xpath("/feed/author[1]/poco:displayName", doc)
+
+      {:ok, %{
+        uri: uri,
+        hub: hub,
+        nickname: preferredUsername || name,
+        name: displayName || name
+      }}
     else e ->
       {:error, e}
     end