From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 19 Dec 2021 17:33:10 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/develop' into manifest
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=e4f9cb1c1b3969164c03a219d5a760df07d2b3cd;hp=-c;p=akkoma

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

e4f9cb1c1b3969164c03a219d5a760df07d2b3cd
diff --combined lib/pleroma/web/router.ex
index afdc4f492,197e1f346..c1713c6cf
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -192,6 -192,9 +192,9 @@@ defmodule Pleroma.Web.Router d
      patch("/users/deactivate", UserController, :deactivate)
      patch("/users/approve", UserController, :approve)
  
+     patch("/users/suggest", UserController, :suggest)
+     patch("/users/unsuggest", UserController, :unsuggest)
+ 
      get("/relay", RelayController, :index)
      post("/relay", RelayController, :follow)
      delete("/relay", RelayController, :unfollow)
@@@ -535,6 -538,7 +538,7 @@@
      delete("/push/subscription", SubscriptionController, :delete)
  
      get("/suggestions", SuggestionController, :index)
+     delete("/suggestions/:account_id", SuggestionController, :dismiss)
  
      get("/timelines/home", TimelineController, :home)
      get("/timelines/direct", TimelineController, :direct)
@@@ -586,6 -590,8 +590,8 @@@
      get("/search", SearchController, :search2)
  
      post("/media", MediaController, :create2)
+ 
+     get("/suggestions", SuggestionController, :index2)
    end
  
    scope "/api", Pleroma.Web do
@@@ -736,12 -742,12 +742,18 @@@
      get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
    end
  
 +  scope "/", Pleroma.Web do
 +    pipe_through(:api)
 +
 +    get("/manifest.json", ManifestController, :show)
 +  end
 +
+   scope "/", Pleroma.Web do
+     pipe_through(:pleroma_html)
+ 
+     post("/auth/password", TwitterAPI.PasswordController, :request)
+   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 93d0ab469,82e955c25..031f7a69d
--- a/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@@ -94,7 -94,7 +94,8 @@@ defmodule Pleroma.Web.Plugs.FrontendSta
        "internal",
        ".well-known",
        "nodeinfo",
 +      "manifest.json",
+       "auth",
        "proxy",
        "test",
        "user_exists",