diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 20:14:28 +0300 |
| commit | 6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9 (patch) | |
| tree | 6b8e22663fd5b6d5cdf3afaa4b306775d59b503a /lib/pleroma/object.ex | |
| parent | 49bb0a130f93476d32d3177d7a989b7a98a063f2 (diff) | |
| parent | af5fef1f228a1781d7d9cad490d3b3a783389f5e (diff) | |
| download | pleroma-6fbafb1cdcba3dc2a7e8b9718e295c9811a726d9.tar.gz | |
Merge branch 'develop' into issue/1276
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} |