Merge remote-tracking branch 'origin/develop' into reactions

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc lib/pleroma/web/common_api/common_api.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 09cbca7665f2b6edc3452ff481cc33476732f4ff,a355a14bdb79513b34d45971363f094e49812154..eae1f676bb1edd05ef3d83d2dcc2cf290c50f2d7
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -287,25 -287,27 +287,36 @@@ defmodule Pleroma.Web.Router d
    end
  
    scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
 +    pipe_through(:api)
 +
 +    get("/statuses/:id/emoji_reactions_by", PleromaAPIController, :emoji_reactions_by)
 +  end
 +
 +  scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
 +    pipe_through(:authenticated_api)
 +
      scope [] do
+       pipe_through(:authenticated_api)
        pipe_through(:oauth_read)
        get("/conversations/:id/statuses", PleromaAPIController, :conversation_statuses)
        get("/conversations/:id", PleromaAPIController, :conversation)
      end
  
      scope [] do
+       pipe_through(:authenticated_api)
        pipe_through(:oauth_write)
        patch("/conversations/:id", PleromaAPIController, :update_conversation)
 +      post("/statuses/:id/react_with_emoji", PleromaAPIController, :react_with_emoji)
        post("/notifications/read", PleromaAPIController, :read_notification)
+ 
+       patch("/accounts/update_avatar", AccountController, :update_avatar)
+       patch("/accounts/update_banner", AccountController, :update_banner)
+       patch("/accounts/update_background", AccountController, :update_background)
+ 
+       get("/mascot", MascotController, :show)
+       put("/mascot", MascotController, :update)
+ 
+       post("/scrobble", ScrobbleController, :new_scrobble)
      end
  
      scope [] do

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge

diff --cc test/web/common_api/common_api_test.exs
Simple merge

diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
Simple merge