X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger_controller.ex;h=50d81625614e180a7dc7d08f51bc8d936660726e;hb=2d775bf1be5ddf0a8c5553ef15dde55c2483c1d4;hp=7c0fd31424d24893861b3363219ca9cf9f216908;hpb=361a8c42197a92f044fc3d0ceadeee5e3590e96f;p=akkoma

diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 7c0fd3142..50d816256 100644
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -4,7 +4,7 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
   alias Pleroma.Web.WebFinger
 
   def host_meta(conn, _params) do
-    xml = WebFinger.host_meta
+    xml = WebFinger.host_meta()
 
     conn
     |> put_resp_content_type("application/xrd+xml")
@@ -12,10 +12,25 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
   end
 
   def webfinger(conn, %{"resource" => resource}) do
-    {:ok, response} = Pleroma.Web.WebFinger.webfinger(resource)
+    case get_format(conn) do
+      n when n in ["xml", "xrd+xml"] ->
+        with {:ok, response} <- WebFinger.webfinger(resource, "XML") do
+          conn
+          |> put_resp_content_type("application/xrd+xml")
+          |> send_resp(200, response)
+        else
+          _e -> send_resp(conn, 404, "Couldn't find user")
+        end
 
-    conn
-    |> put_resp_content_type("application/xrd+xml")
-    |> send_resp(200, response)
+      n when n in ["json", "jrd+json"] ->
+        with {:ok, response} <- WebFinger.webfinger(resource, "JSON") do
+          json(conn, response)
+        else
+          _e -> send_resp(conn, 404, "Couldn't find user")
+        end
+
+      _ ->
+        send_resp(conn, 404, "Unsupported format")
+    end
   end
 end