X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger_controller.ex;h=8c60300a49673e26d54b974063ad579612141f22;hb=98c31deaa960392184da4f34ddc9e3eecbce3f4c;hp=eb54346c1fef761cd896e9e6c4d6ff02f8d65e74;hpb=b72a25f5b1ce18698b1b3aff6487157898dc7846;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 eb54346c1..8c60300a4 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") @@ -21,14 +23,20 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do 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 + + def webfinger(conn, _params) do + send_resp(conn, 400, "Bad Request") + end end