diff options
author | lain <lain@soykaf.club> | 2019-09-13 16:31:27 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-09-13 16:31:27 +0200 |
commit | a7f31bf06cfe3f8e2549393f34d6573854d783c0 (patch) | |
tree | f53d6747ee73044f7b342d3fdae3d30b5b5b3c90 /lib/pleroma/object.ex | |
parent | f649a2e972b70dfefb7bfc110b27a0194cda51c5 (diff) | |
parent | 0d9609894f4f4557da2db62a33da1b8995c9e1d7 (diff) | |
download | pleroma-a7f31bf06cfe3f8e2549393f34d6573854d783c0.tar.gz |
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r-- | lib/pleroma/object.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index d58eb7f7d..5033798ae 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -130,14 +130,16 @@ 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), - {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do + {:ok, true} <- Cachex.del(:object_cache, "object:#{id}"), + {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path) do {:ok, object, deleted_activity} end end def prune(%Object{data: %{"id" => id}} = object) do with {:ok, object} <- Repo.delete(object), - {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do + {:ok, true} <- Cachex.del(:object_cache, "object:#{id}"), + {:ok, _} <- Cachex.del(:web_resp_cache, URI.parse(id).path) do {:ok, object} end end |