Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending...

diff --cc config/description.exs
Simple merge

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

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

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

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 9d83a9fc1f72dc6d73f3b29972cdc700ed8b4cd7,fb80dd348cb2475b29b55e2d688cccc9b107274b..21bc3d5a549d5fde33a633c00f1147df3968deb4
--- 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
@@@ -60,18 -59,14 +59,18 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
  
    plug(
      Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
-     when action != :create
+     when action not in [:create, :show, :statuses]
    )
  
 -  @relations [:follow, :unfollow]
 +  @relationship_actions [:follow, :unfollow]
    @needs_account ~W(followers following lists follow unfollow mute unmute block unblock)a
  
 -  plug(RateLimiter, [name: :relations_id_action, params: ["id", "uri"]] when action in @relations)
 -  plug(RateLimiter, [name: :relations_actions] when action in @relations)
 +  plug(
 +    RateLimiter,
 +    [name: :relation_id_action, params: ["id", "uri"]] when action in @relationship_actions
 +  )
 +
 +  plug(RateLimiter, [name: :relations_actions] when action in @relationship_actions)
    plug(RateLimiter, [name: :app_account_creation] when action == :create)
    plug(:assign_account_by_id when action in @needs_account)
  

diff --cc test/notification_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge