From: rinpatch <rinpatch@sdf.org>
Date: Thu, 14 Mar 2019 17:49:00 +0000 (+0000)
Subject: Merge branch 'hotfix/delete-activities' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=34fc0dca2e879bcbb73acc80fdc72678411d0ebf;hp=59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef;p=akkoma

Merge branch 'hotfix/delete-activities' into 'develop'

Fix delete activities not federating

See merge request pleroma/pleroma!933
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index d5b03cd24..70db419ca 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -310,7 +310,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ true) do
     user = User.get_cached_by_ap_id(actor)
-    to = object.data["to"] || [] ++ object.data["cc"] || []
+    to = (object.data["to"] || []) ++ (object.data["cc"] || [])
 
     with {:ok, object, activity} <- Object.delete(object),
          data <- %{