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

diff --combined lib/pleroma/web/router.ex
index 4e7de2b89f73399fd83260666d7fd3f4a0884c38,ccf2ef796b33633215a36e3db10ca7dd66bb7f0b..3a6c1f2cf96d25d7a25788a46b98d9610e677fbf
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -140,10 -140,6 +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)
  
@@@ -208,7 -204,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)
@@@ -635,7 -631,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)
@@@ -649,7 -645,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)
@@@ -657,7 -653,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
@@@ -708,6 -704,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