From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 4 Jun 2020 09:30:14 +0000 (+0400)
Subject: Merge branch 'develop' into openapi/admin/relay
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=70f054b0836e81e5c3572634af56c9deb03d2ae0;p=akkoma

Merge branch 'develop' into openapi/admin/relay
---

70f054b0836e81e5c3572634af56c9deb03d2ae0
diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 0c30b106c,467d05375..b7fcd4bbf
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@@ -19,7 -17,7 +17,6 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Builder
    alias Pleroma.Web.ActivityPub.Pipeline
-   alias Pleroma.Web.ActivityPub.Utils
 -  alias Pleroma.Web.ActivityPub.Relay
    alias Pleroma.Web.AdminAPI
    alias Pleroma.Web.AdminAPI.AccountView
    alias Pleroma.Web.AdminAPI.ConfigView
@@@ -68,21 -62,9 +61,9 @@@
    plug(
      OAuthScopesPlug,
      %{scopes: ["write:follows"], admin: true}
 -    when action in [:user_follow, :user_unfollow, :relay_follow, :relay_unfollow]
 +    when action in [:user_follow, :user_unfollow]
    )
  
-   plug(
-     OAuthScopesPlug,
-     %{scopes: ["read:reports"], admin: true}
-     when action in [:list_reports, :report_show]
-   )
- 
-   plug(
-     OAuthScopesPlug,
-     %{scopes: ["write:reports"], admin: true}
-     when action in [:reports_update, :report_notes_create, :report_notes_delete]
-   )
- 
    plug(
      OAuthScopesPlug,
      %{scopes: ["read:statuses"], admin: true}