diff options
author | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-25 11:44:51 +0200 |
commit | c1d51944c71ff90650b1a631241daf0d8be5b861 (patch) | |
tree | 2e78efaeb892c4b09cac0439f268d6a60637b4dc /lib/pleroma/web/controller_helper.ex | |
parent | 199ad47c22e5d72741f5809eb015bac9b00cca03 (diff) | |
parent | 5722b0e2e5e7113f0422798a6ea8cc40d1953291 (diff) | |
download | pleroma-c1d51944c71ff90650b1a631241daf0d8be5b861.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r-- | lib/pleroma/web/controller_helper.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 69946fb81..6445966e0 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -18,6 +18,12 @@ defmodule Pleroma.Web.ControllerHelper do def truthy_param?(value), do: not falsy_param?(value) + def json_response(conn, status, _) when status in [204, :no_content] do + conn + |> put_resp_header("content-type", "application/json") + |> send_resp(status, "") + end + def json_response(conn, status, json) do conn |> put_status(status) |