diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
| commit | 9ef912aecfbeef670db0614ec2014321c37f3b7a (patch) | |
| tree | 69eb0b5e11ca321e1ba8ca794171bf0cb425d16d /lib/pleroma/object.ex | |
| parent | e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (diff) | |
| parent | 92b4a1aa1bc750bb077ae45c422967f9712e247d (diff) | |
| download | pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.tar.gz | |
Merge branch 'develop' into issue/1411
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 768079dec..eb37b95a6 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -164,7 +164,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} |