diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-11 14:45:54 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-11 14:45:54 +0700 |
| commit | f1f7a11222f4689f000825147d16b366d915f393 (patch) | |
| tree | 1a00e5c58bd1edfac01ca2cc9ac553e5ab7b92f0 /lib/pleroma/web/controller_helper.ex | |
| parent | b6b5b16ba4d65ecd9812b02d79f844548266eb8b (diff) | |
| parent | 8d13c42926450aff6a0062f092cd1a5d59f99869 (diff) | |
| download | pleroma-f1f7a11222f4689f000825147d16b366d915f393.tar.gz | |
Merge develop
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) |