X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Fcontroller_helper.ex;h=4d6192db03edb5f63eb8bbbc66078c0cb20d5792;hb=5c7b774f09d86414e6a8ef6494ccd2e6a76c1396;hp=cb0463eeb52314429a3bb5987b23ca6fe54a7f2c;hpb=89fbed88212657e3dcd4bbcb2c0718b07802037f;p=akkoma
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index cb0463eeb..4d6192db0 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -1,10 +1,16 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# 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)