Merge remote-tracking branch 'pleroma/develop' into manifest

diff --combined lib/pleroma/web/router.ex
index c3b74e622efa34c21703d1ddf58f0dc311509863,abb332ec2f1f9eed9b232f83fa34f50b0fa7b654..afdc4f492062a291d9260e669ed773e664d3939c
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -96,14 -96,12 +96,12 @@@ defmodule Pleroma.Web.Router d
      plug(Pleroma.Web.Plugs.AdminSecretAuthenticationPlug)
      plug(:after_auth)
      plug(Pleroma.Web.Plugs.EnsureAuthenticatedPlug)
-     plug(Pleroma.Web.Plugs.UserIsAdminPlug)
+     plug(Pleroma.Web.Plugs.UserIsStaffPlug)
      plug(Pleroma.Web.Plugs.IdempotencyPlug)
    end
  
-   pipeline :mastodon_html do
-     plug(:browser)
-     plug(:authenticate)
-     plug(:after_auth)
+   pipeline :require_admin do
+     plug(Pleroma.Web.Plugs.UserIsAdminPlug)
    end
  
    pipeline :pleroma_html do
@@@ -160,7 -158,7 +158,7 @@@
    end
  
    scope "/api/v1/pleroma/admin", Pleroma.Web.AdminAPI do
-     pipe_through(:admin_api)
+     pipe_through([:admin_api, :require_admin])
  
      put("/users/disable_mfa", AdminAPIController, :disable_mfa)
      put("/users/tag", AdminAPIController, :tag_users)
@@@ -213,7 -211,8 +211,8 @@@
      get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
      get("/users/:nickname/chats", AdminAPIController, :list_user_chats)
  
-     get("/instances/:instance/statuses", AdminAPIController, :list_instance_statuses)
+     get("/instances/:instance/statuses", InstanceController, :list_statuses)
+     delete("/instances/:instance", InstanceController, :delete)
  
      get("/instance_document/:name", InstanceDocumentController, :show)
      patch("/instance_document/:name", InstanceDocumentController, :update)
@@@ -265,7 -264,7 +264,7 @@@
  
    scope "/api/v1/pleroma/emoji", Pleroma.Web.PleromaAPI do
      scope "/pack" do
-       pipe_through(:admin_api)
+       pipe_through([:admin_api, :require_admin])
  
        post("/", EmojiPackController, :create)
        patch("/", EmojiPackController, :update)
@@@ -280,7 -279,7 +279,7 @@@
  
      # Modifying packs
      scope "/packs" do
-       pipe_through(:admin_api)
+       pipe_through([:admin_api, :require_admin])
  
        get("/import", EmojiPackController, :import_from_filesystem)
        get("/remote", EmojiPackController, :remote)
@@@ -542,13 -541,6 +541,6 @@@
      get("/timelines/list/:list_id", TimelineController, :list)
    end
  
-   scope "/api/web", Pleroma.Web do
-     pipe_through(:authenticated_api)
- 
-     # Backend-obscure settings blob for MastoFE, don't parse/reuse elsewhere
-     put("/settings", MastoFEController, :put_settings)
-   end
- 
    scope "/api/v1", Pleroma.Web.MastodonAPI do
      pipe_through(:app_api)
  
@@@ -744,31 -736,6 +736,12 @@@
      get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
    end
  
-   scope "/", Pleroma.Web do
-     pipe_through(:api)
- 
-     get("/web/manifest.json", MastoFEController, :manifest)
-   end
- 
 +  scope "/", Pleroma.Web do
 +    pipe_through(:api)
 +
 +    get("/manifest.json", ManifestController, :show)
 +  end
 +
-   scope "/", Pleroma.Web do
-     pipe_through(:mastodon_html)
- 
-     get("/web/login", MastodonAPI.AuthController, :login)
-     delete("/auth/sign_out", MastodonAPI.AuthController, :logout)
- 
-     post("/auth/password", MastodonAPI.AuthController, :password_reset)
- 
-     get("/web/*path", MastoFEController, :index)
- 
-     get("/embed/:id", EmbedController, :show)
-   end
- 
    scope "/proxy/", Pleroma.Web do
      get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
      get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)

diff --combined test/pleroma/web/plugs/frontend_static_plug_test.exs
index a1cce6398e0a2c89e08e857d1de48e683bde8b34,a9342e6f02306906a19ce36fa1365aea9a9fd408..93d0ab469a22b9c320c451d276b066e27066e4c6
--- 1/test/pleroma/web/plugs/frontend_static_plug_test.exs
--- 2/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@@ -94,10 -94,6 +94,7 @@@ defmodule Pleroma.Web.Plugs.FrontendSta
        "internal",
        ".well-known",
        "nodeinfo",
-       "web",
 +      "manifest.json",
-       "auth",
-       "embed",
        "proxy",
        "test",
        "user_exists",