aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-11-01 07:43:36 +0000
committerkaniini <nenolod@gmail.com>2018-11-01 07:43:36 +0000
commit68a14056437d2aae6cfd3de7107f93fddc1ef7d9 (patch)
treed332e481ccc08dc66930b27330a755cfea3f41d3 /lib/pleroma/web/common_api
parent33587f5cb4650842798bea9fb3b407afc7179259 (diff)
parentf55fc68f766c71e81ce754408007e3b763f32e0f (diff)
downloadpleroma-68a14056437d2aae6cfd3de7107f93fddc1ef7d9.tar.gz
Merge branch 'refactor/object-cache-deletion' into 'develop'
refactor object cache deletion See merge request pleroma/pleroma!408
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 8607cb6b3..8f47bb127 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -9,8 +9,7 @@ defmodule Pleroma.Web.CommonAPI do
with %Activity{data: %{"object" => %{"id" => object_id}}} <- Repo.get(Activity, activity_id),
%Object{} = object <- Object.normalize(object_id),
true <- user.info["is_moderator"] || user.ap_id == object.data["actor"],
- {:ok, delete} <- ActivityPub.delete(object),
- {:ok, true} <- Cachex.del(:user_cache, "object:#{object_id}") do
+ {:ok, delete} <- ActivityPub.delete(object) do
{:ok, delete}
end
end