From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 28 May 2021 18:51:21 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=39127f15eb36c4fb41838a232f9d80c50416838d;hp=-c;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
---

39127f15eb36c4fb41838a232f9d80c50416838d
diff --combined lib/pleroma/web/router.ex
index 3550088bb,f5a582a7e..95d56699e
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -140,6 -140,10 +140,10 @@@ defmodule Pleroma.Web.Router d
      plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug)
    end
  
+   pipeline :static_fe do
+     plug(Pleroma.Web.Plugs.StaticFEPlug)
+   end
+ 
    scope "/api/v1/pleroma", Pleroma.Web.TwitterAPI do
      pipe_through(:pleroma_api)
  
@@@ -204,7 -208,7 +208,7 @@@
      get("/users/:nickname/credentials", AdminAPIController, :show_user_credentials)
      patch("/users/:nickname/credentials", AdminAPIController, :update_user_credentials)
  
-     get("/users", UserController, :list)
+     get("/users", UserController, :index)
      get("/users/:nickname", UserController, :show)
      get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
      get("/users/:nickname/chats", AdminAPIController, :list_user_chats)
@@@ -631,7 -635,7 +635,7 @@@
    scope "/", Pleroma.Web do
      # Note: html format is supported only if static FE is enabled
      # Note: http signature is only considered for json requests (no auth for non-json requests)
-     pipe_through([:accepts_html_json, :http_signature, Pleroma.Web.Plugs.StaticFEPlug])
+     pipe_through([:accepts_html_json, :http_signature, :static_fe])
  
      get("/objects/:uuid", OStatus.OStatusController, :object)
      get("/activities/:uuid", OStatus.OStatusController, :activity)
@@@ -645,7 -649,7 +649,7 @@@
    scope "/", Pleroma.Web do
      # Note: html format is supported only if static FE is enabled
      # Note: http signature is only considered for json requests (no auth for non-json requests)
-     pipe_through([:accepts_html_xml_json, :http_signature, Pleroma.Web.Plugs.StaticFEPlug])
+     pipe_through([:accepts_html_xml_json, :http_signature, :static_fe])
  
      # Note: returns user _profile_ for json requests, redirects to user _feed_ for non-json ones
      get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
@@@ -653,7 -657,7 +657,7 @@@
  
    scope "/", Pleroma.Web do
      # Note: html format is supported only if static FE is enabled
-     pipe_through([:accepts_html_xml, Pleroma.Web.Plugs.StaticFEPlug])
+     pipe_through([:accepts_html_xml, :static_fe])
  
      get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
    end
@@@ -704,6 -708,7 +708,7 @@@
      # The following two are S2S as well, see `ActivityPub.fetch_follow_information_for_user/1`:
      get("/users/:nickname/followers", ActivityPubController, :followers)
      get("/users/:nickname/following", ActivityPubController, :following)
+     get("/users/:nickname/collections/featured", ActivityPubController, :pinned)
    end
  
    scope "/", Pleroma.Web.ActivityPub do
@@@ -764,11 -769,11 +769,11 @@@
      get("/embed/:id", EmbedController, :show)
    end
  
-   scope "/proxy/", Pleroma.Web.MediaProxy do
-     get("/preview/:sig/:url", MediaProxyController, :preview)
-     get("/preview/:sig/:url/:filename", MediaProxyController, :preview)
-     get("/:sig/:url", MediaProxyController, :remote)
-     get("/:sig/:url/:filename", MediaProxyController, :remote)
+   scope "/proxy/", Pleroma.Web do
+     get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
+     get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)
+     get("/:sig/:url", MediaProxy.MediaProxyController, :remote)
+     get("/:sig/:url/:filename", MediaProxy.MediaProxyController, :remote)
    end
  
    if Pleroma.Config.get(:env) == :dev do
@@@ -821,16 -826,4 +826,16 @@@
  
      options("/*path", RedirectController, :empty)
    end
 +
 +  # TODO: Change to Phoenix.Router.routes/1 for Phoenix 1.6.0+
 +  def get_api_routes do
 +    __MODULE__.__routes__()
 +    |> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
 +    |> Enum.map(fn r ->
 +      r.path
 +      |> String.split("/", trim: true)
 +      |> List.first()
 +    end)
 +    |> Enum.uniq()
 +  end
  end