diff options
| author | lain <lain@soykaf.club> | 2019-12-06 13:48:37 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-06 13:48:37 +0000 |
| commit | a280be34e36223aefd3d5e26fcddb9faad77310b (patch) | |
| tree | edc39a1b48f48334480e709fbda844cb120b32f8 /lib/pleroma/object.ex | |
| parent | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff) | |
| parent | cdff5b82670313e46c2b362d4cf041779af6a6bd (diff) | |
| download | pleroma-a280be34e36223aefd3d5e26fcddb9faad77310b.tar.gz | |
Merge branch 'fix/mrf-delete' into 'develop'
ActivityPub: Fix deletes being exempt from MRF
Closes #1461
See merge request pleroma/pleroma!2037
Diffstat (limited to 'lib/pleroma/object.ex')
| -rw-r--r-- | lib/pleroma/object.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index b4ed3a9b2..ff0e59241 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -147,7 +147,7 @@ defmodule Pleroma.Object do def delete(%Object{data: %{"id" => id}} = object) do with {:ok, _obj} = swap_object_with_tombstone(object), - deleted_activity = Activity.delete_by_ap_id(id), + deleted_activity = Activity.delete_all_by_object_ap_id(id), {:ok, true} <- Cachex.del(:object_cache, "object:#{id}"), {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path) do {:ok, object, deleted_activity} |