X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger_controller.ex;h=0023531661d0fd5148dd0bfb0200c02cbdd64096;hb=114b95cee20c9bb4922627e5397a70d60e905fa6;hp=d4536fc46b2beed0be231fe59824025a38c63905;hpb=8004ee8ccfa63181fb103ea50db3b10956d81ce9;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 d4536fc46..002353166 100644
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -3,8 +3,10 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
 
   alias Pleroma.Web.WebFinger
 
+  plug(Pleroma.Web.FederatingPlug)
+
   def host_meta(conn, _params) do
-    xml = WebFinger.host_meta
+    xml = WebFinger.host_meta()
 
     conn
     |> put_resp_content_type("application/xrd+xml")
@@ -12,12 +14,25 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
   end
 
   def webfinger(conn, %{"resource" => resource}) do
-    with {:ok, response} <- WebFinger.webfinger(resource) do
-      conn
-      |> put_resp_content_type("application/xrd+xml")
-      |> send_resp(200, response)
-    else
-      _e -> send_resp(conn, 404, "Couldn't find user")
+    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
+
+      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