Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index 588027de145a2d483f2bc55eb44aa4a0a3ac7ed2..8c73d1fa00efb5d249fabe4a84b0cec703fb5d94 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -63,10 +63,6 @@ defmodule Pleroma.Activity do
     )
   end
 
-  def get_all_by_object_ap_id(ap_id) do
-    Repo.all(create_by_object_ap_id(ap_id))
-  end
-
   def create_activity_by_object_id_query(ap_ids) do
     from(
       activity in Activity,
@@ -81,6 +77,10 @@ defmodule Pleroma.Activity do
     )
   end
 
+  def get_all_create_by_object_ap_id(ap_id) do
+    Repo.all(create_by_object_ap_id(ap_id))
+  end
+
   def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do
     create_activity_by_object_id_query([ap_id])
     |> Repo.one()

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index cfbe6c85735f4f4d7ec1a599c456f49a8a0d21a3..4f4a54052252aca41de34982aee8b0ee20f7d53c 100644 (file)
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -198,7 +198,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     # Update activities that already had this. Could be done in a seperate process.
     # Alternatively, just don't do this and fetch the current object each time. Most
     # could probably be taken from cache.
-    relevant_activities = Activity.get_all_by_object_ap_id(id)
+    relevant_activities = Activity.get_all_create_by_object_ap_id(id)
 
     Enum.map(relevant_activities, fn activity ->
       new_activity_data = activity.data |> Map.put("object", object.data)

diff --git a/test/activity_test.exs b/test/activity_test.exs
index 8f3f613ece48e9758f2e4fb254200585f7743e56..dcac8649a72f7c265c0f0f952edced24025dbdbe 100644 (file)
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -16,7 +16,7 @@ defmodule Pleroma.ActivityTest do
 
   test "returns activities by it's objects AP ids" do
     activity = insert(:note_activity)
-    [found_activity] = Activity.get_all_by_object_ap_id(activity.data["object"]["id"])
+    [found_activity] = Activity.get_all_create_by_object_ap_id(activity.data["object"]["id"])
 
     assert activity == found_activity
   end

diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 6538fb7afe638e260cf08277b6186c23d9925354..ea9ac5ba89f2df9fa42e1628f463c550456f1e65 100644 (file)
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -330,7 +330,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       assert like_activity == same_like_activity
       assert object.data["likes"] == [user.ap_id]
 
-      [note_activity] = Activity.get_all_by_object_ap_id(object.data["id"])
+      [note_activity] = Activity.get_all_create_by_object_ap_id(object.data["id"])
       assert note_activity.data["object"]["like_count"] == 1
 
       {:ok, _like_activity, object} = ActivityPub.like(user_two, object)