Merge branch 'develop' into feature/gen-magic

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 27bf6347d3ad683c9243d5034c1405b2e88eab42,6bf7421bb6e9df004577262dd22c919f0543c489..570bcc7e7384613378d0462737cc8f435a3b859f
--- 1/lib/pleroma/web/activity_pub/activity_pub_controller.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@@ -45,10 -45,8 +45,10 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      when action in [:read_inbox, :update_outbox, :whoami, :upload_media]
    )
  
 +  plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:upload_media])
 +
    plug(
-     Pleroma.Plugs.Cache,
+     Pleroma.Web.Plugs.Cache,
      [query_params: false, tracking_fun: &__MODULE__.track_object_fetch/2]
      when action in [:activity, :object]
    )

diff --cc lib/pleroma/web/mastodon_api/controllers/media_controller.ex
index 09acea7f49fbab66d791da7102ca42e3760a9f2d,9586b14bc37c906d266e0c58fd41036a64ad5018..161193134132bb905ae0855a964f5bb008a273cf
--- 1/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
--- 2/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
@@@ -6,12 -6,11 +6,12 @@@ defmodule Pleroma.Web.MastodonAPI.Media
    use Pleroma.Web, :controller
  
    alias Pleroma.Object
-   alias Pleroma.Plugs.OAuthScopesPlug
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
+   alias Pleroma.Web.Plugs.OAuthScopesPlug
  
    action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
 +  plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:create, :create2])
    plug(Pleroma.Web.ApiSpec.CastAndValidate)
    plug(:put_view, Pleroma.Web.MastodonAPI.StatusView)
  

diff --cc lib/pleroma/web/pleroma_api/controllers/account_controller.ex
Simple merge

diff --cc lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
index 7e2f6c3284d9b53964213f47b0008ce5f181ebef,0f6f0b9dbc6818f1efda0a2055275468fce09f1d..15210f1e65d4f4373d28876872eb8adf40bcb6b0
--- 1/lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
--- 2/lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
@@@ -5,11 -5,10 +5,11 @@@
  defmodule Pleroma.Web.PleromaAPI.MascotController do
    use Pleroma.Web, :controller
  
-   alias Pleroma.Plugs.OAuthScopesPlug
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
+   alias Pleroma.Web.Plugs.OAuthScopesPlug
  
 +  plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:update])
    plug(Pleroma.Web.ApiSpec.CastAndValidate)
    plug(OAuthScopesPlug, %{scopes: ["read:accounts"]} when action == :show)
    plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action != :show)

diff --cc test/pleroma/upload_test.exs
Simple merge

diff --cc test/pleroma/web/activity_pub/activity_pub_controller_test.exs
Simple merge