From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Fri, 24 Apr 2020 14:37:58 +0000 (+0400)
Subject: Merge branch 'develop' into global-status-expiration
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e;p=akkoma

Merge branch 'develop' into global-status-expiration
---

c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e
diff --cc CHANGELOG.md
index cf750637a,702c58180..9805e30df
--- a/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 lib/pleroma/web/common_api/common_api.ex
index 54be69ee5,d1efe0c36..7f1cc9fb6
--- a/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"},