aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-01-21 06:15:05 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-01-21 07:50:57 +0100
commit75e4c8f0b21323f072f06e25e10762339abc6e3b (patch)
treed4452686d59af6d1a4884b9820a1027793e07d2a /lib
parentb82c6dc53685ebd26c276eccc5ed915ddf81afa6 (diff)
downloadpleroma-75e4c8f0b21323f072f06e25e10762339abc6e3b.tar.gz
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/activity.ex3
-rw-r--r--lib/pleroma/object.ex2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index e3edec475..3be6fb82b 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -53,8 +53,7 @@ defmodule Pleroma.Activity do
)
end
- # Wrong name, returns all.
- def all_non_create_by_object_ap_id_q(ap_id) do
+ def by_object_ap_id(ap_id) do
from(
activity in Activity,
where:
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