aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 03:04:42 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 03:06:00 +0000
commit332dc1371bd708c69517af5972f71cf86b477614 (patch)
tree818c96e66af1321d7f763e7ec173e6a5fbb5b04f
parentdebf7f016d5f09b5878ddb24051a28ddb2cf1e4a (diff)
downloadpleroma-332dc1371bd708c69517af5972f71cf86b477614.tar.gz
user: use preloads when deleting accounts
-rw-r--r--lib/pleroma/user.ex6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f2ef0a838..41289b4d0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1110,13 +1110,15 @@ defmodule Pleroma.User do
friends
|> Enum.each(fn followed -> User.unfollow(user, followed) end)
- query = from(a in Activity, where: a.actor == ^user.ap_id)
+ query =
+ from(a in Activity, where: a.actor == ^user.ap_id)
+ |> Activity.with_preloaded_object()
Repo.all(query)
|> Enum.each(fn activity ->
case activity.data["type"] do
"Create" ->
- ActivityPub.delete(Object.normalize(activity.data["object"]))
+ ActivityPub.delete(Object.normalize(activity))
# TODO: Do something with likes, follows, repeats.
_ ->