aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object.ex
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-09-09 18:53:09 +0000
committerfeld <feld@feld.me>2019-09-09 18:53:09 +0000
commitceb2e09126a48fa341d5ff84371db49ae022bc12 (patch)
treeca875c111e886b051385250811115284f88d1628 /lib/pleroma/object.ex
parentbce16f455743c3a6603fb5d2d81c4e8200b38494 (diff)
parent11e12b5761bcd67aa609d91f6f8d1f6755b2312b (diff)
downloadpleroma-ceb2e09126a48fa341d5ff84371db49ae022bc12.tar.gz
Merge branch 'cache-plug' into 'develop'
Add Pleroma.Plugs.Cache Closes #1174 See merge request pleroma/pleroma!1612
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r--lib/pleroma/object.ex6
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