diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
| commit | f4e2595592ccca6cedd64669baef7bdd2a6547d0 (patch) | |
| tree | 6806a79345c7599b0d436df8b6c46e75b54d1292 /lib/pleroma/web/controller_helper.ex | |
| parent | 3c4cab9be18ff543d025177b418ddd0b16050e68 (diff) | |
| parent | 9789e000b05621435dc0c03833f564481e0b80e6 (diff) | |
| download | pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.tar.gz | |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 181483664..55706eeb8 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -10,12 +10,6 @@ defmodule Pleroma.Web.ControllerHelper do def truthy_param?(blank_value) when blank_value in [nil, ""], do: nil def truthy_param?(value), do: value not in @falsy_param_values - def oauth_scopes(params, default) do - # Note: `scopes` is used by Mastodon — supporting it but sticking to - # OAuth's standard `scope` wherever we control it - Pleroma.Web.OAuth.parse_scopes(params["scope"] || params["scopes"], default) - end - def json_response(conn, status, json) do conn |> put_status(status) |