Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication...

# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index f39825e08838f2e638f7721afd9ea05be9d5e832,37adeec5f0739a318fbecec2488763c7e42ccd44..1eedf02d66a823d0cfc62ce60e2dc964b3252679
--- 1/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
--- 2/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@@ -27,9 -26,9 +27,11 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
    alias Pleroma.Web.OAuth.Token
    alias Pleroma.Web.TwitterAPI.TwitterAPI
  
 -  plug(:skip_plug, OAuthScopesPlug when action == :identity_proofs)
+   plug(OpenApiSpex.Plug.CastAndValidate, render_error: Pleroma.Web.ApiSpec.RenderError)
+ 
 +  plug(:skip_plug, [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :create)
 +
 +  plug(:skip_plug, EnsurePublicOrAuthenticatedPlug when action in [:show, :statuses])
  
    plug(
      OAuthScopesPlug,
@@@ -359,7 -378,7 +381,7 @@@
    end
  
    @doc "POST /api/v1/follows"
-   def follow_by_uri(conn, %{"uri" => uri}) do
 -  def follows(%{body_params: %{uri: uri}} = conn, _) do
++  def follow_by_uri(%{body_params: %{uri: uri}} = conn, _) do
      case User.get_cached_by_nickname(uri) do
        %User{} = user ->
          conn

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
Simple merge