diff options
author | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
commit | 5067b791a124960e3561ff77065a36d45abd2552 (patch) | |
tree | 38cf094a6405c147fe5d8cff3be173f2379166d9 /lib/pleroma/object.ex | |
parent | b624b7a150c813722c4ffe82112c03e246fb5760 (diff) | |
parent | 2de208817c04d9a48aaf0fdaf887dd0e10d15907 (diff) | |
download | pleroma-5067b791a124960e3561ff77065a36d45abd2552.tar.gz |
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
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 ff5eb9b27..707a61f14 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -85,7 +85,7 @@ defmodule Pleroma.Object do def delete(%Object{data: %{"id" => id}} = object) do with {:ok, _obj} = swap_object_with_tombstone(object), - Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)), + Repo.delete_all(Activity.by_object_ap_id(id)), {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do {:ok, object} end |