Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature...

[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 d4536fc46b2beed0be231fe59824025a38c63905..50d81625614e180a7dc7d08f51bc8d936660726e 100644 (file)
--- 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,12 +12,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