X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcontroller_helper.ex;h=5915ea40e76730ceaa8bb233b29ced4939312fca;hb=984b5f8adfd1e7b981a270193d1ebd76f468576c;hp=13cf1877f9689750272683719eda220ffc9278c0;hpb=8654a591f08c7d8d5d61f075906f0c6907e877bb;p=akkoma

diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index 13cf1877f..5915ea40e 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -5,14 +5,14 @@
 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)
     |> json(json)
   end
-
-  def set_requester_reachable(conn) do
-    with [referer] <- get_req_header(conn, "referer"),
-         do: Pleroma.Instances.set_reachable(referer)
-  end
 end