projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/ci-release-build
[akkoma]
/
lib
/
pleroma
/
web
/
controller_helper.ex
diff --git
a/lib/pleroma/web/controller_helper.ex
b/lib/pleroma/web/controller_helper.ex
index 181483664ff45443a15f15d0ec5cf6821d3a65ad..55706eeb84a7e843d4ab8c3bd73d8de56febeb12 100644
(file)
--- 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 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)
def json_response(conn, status, json) do
conn
|> put_status(status)