diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-14 17:49:00 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 17:49:00 +0000 |
| commit | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (patch) | |
| tree | 8ba4cc845c92ed27bfaa83792e9c369e15bf2992 /lib | |
| parent | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff) | |
| parent | e630e5e13543ae9bdf1867495ebbe6b3a2582b38 (diff) | |
| download | pleroma-34fc0dca2e879bcbb73acc80fdc72678411d0ebf.tar.gz | |
Merge branch 'hotfix/delete-activities' into 'develop'
Fix delete activities not federating
See merge request pleroma/pleroma!933
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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 <- %{ |