X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger_controller.ex;h=50d81625614e180a7dc7d08f51bc8d936660726e;hb=06c97f211fc4a8c9c9c7e77143c3398ade817ab4;hp=eb54346c1fef761cd896e9e6c4d6ff02f8d65e74;hpb=8aa639a450c94fc3fb8ea812b334892324ffd51a;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..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") @@ -21,12 +21,14 @@ 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