Merge branch 'develop' into global-status-expiration

diff --cc CHANGELOG.md
index cf750637a48ddbc29c14aeee2e10590cb1ca5af4,702c581806e70f01be7df7da402961311c34fe37..9805e30df9f4c9feda329abcdbcfc9749b71a835
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -23,10 -24,9 +24,12 @@@ The format is based on [Keep a Changelo
  
  ### Fixed
  - Support pagination in conversations API
+ - **Breaking**: SimplePolicy `:reject` and `:accept` allow deletions again
+ - Fix follower/blocks import when nicknames starts with @
  
 +### Changed
 +- MFR policy to set global expiration for all local Create activities
 +
  ## [unreleased-patch]
  ### Fixed
  - Logger configuration through AdminFE

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

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

diff --cc lib/pleroma/web/common_api/common_api.ex
index 54be69ee5c51b42dde2a8984de296a9e3488e29d,d1efe0c36e0d1a19eb9377d700639c2434ef8bb0..7f1cc9fb620c0e1c375e1007619ddf1ced1482cb
--- 1/lib/pleroma/web/common_api/common_api.ex
--- 2/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@@ -322,7 -327,15 +325,7 @@@ defmodule Pleroma.Web.CommonAPI d
      end
    end
  
-   def pin(id_or_ap_id, %{ap_id: user_ap_id} = user) do
 -  defp maybe_create_activity_expiration({:ok, activity}, %NaiveDateTime{} = expires_at) do
 -    with {:ok, _} <- ActivityExpiration.create(activity, expires_at) do
 -      {:ok, activity}
 -    end
 -  end
 -
 -  defp maybe_create_activity_expiration(result, _), do: result
 -
+   def pin(id, %{ap_id: user_ap_id} = user) do
      with %Activity{
             actor: ^user_ap_id,
             data: %{"type" => "Create"},

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