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

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

bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2
diff --combined lib/pleroma/web/router.ex
index 257455616,ccf2ef796..4b66d1471
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -204,7 -204,7 +204,7 @@@ defmodule Pleroma.Web.Router d
      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)
@@@ -704,6 -704,7 +704,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 -765,11 +765,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