projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hotfix/delete-activities' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
controller_helper.ex
diff --git
a/lib/pleroma/web/controller_helper.ex
b/lib/pleroma/web/controller_helper.ex
index cb0463eeb52314429a3bb5987b23ca6fe54a7f2c..4d6192db03edb5f63eb8bbbc66078c0cb20d5792 100644
(file)
--- a/
lib/pleroma/web/controller_helper.ex
+++ b/
lib/pleroma/web/controller_helper.ex
@@
-1,10
+1,16
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ControllerHelper do
use Pleroma.Web, :controller
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ControllerHelper do
use Pleroma.Web, :controller
+ 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)