More Jason changes.

[akkoma] / lib / pleroma / web / web_finger / web_finger_controller.ex

diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 7c0fd31424d24893861b3363219ca9cf9f216908..eb54346c1fef761cd896e9e6c4d6ff02f8d65e74 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -12,10 +12,23 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
   end
 
   def webfinger(conn, %{"resource" => resource}) do
-    {:ok, response} = Pleroma.Web.WebFinger.webfinger(resource)
-
-    conn
-    |> put_resp_content_type("application/xrd+xml")
-    |> send_resp(200, response)
+    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