From 46dab37351994567ddb3a8a6fe654355175fe654 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 19 Nov 2020 15:29:26 +0300
Subject: [PATCH] little fix

---
 lib/pleroma/activity.ex                          |  1 +
 test/pleroma/activity_test.exs                   | 16 ++++++++++++++++
 .../activity_pub_controller_test.exs             |  6 +++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index bda5aa616..8559ae6a9 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -362,6 +362,7 @@ def get_by_object_ap_id_with_object(ap_id) when is_binary(ap_id) do
     ap_id
     |> Queries.by_object_id()
     |> with_preloaded_object()
+    |> first()
     |> Repo.one()
   end
 
diff --git a/test/pleroma/activity_test.exs b/test/pleroma/activity_test.exs
index ee6a99cc3..3e9fe209e 100644
--- a/test/pleroma/activity_test.exs
+++ b/test/pleroma/activity_test.exs
@@ -231,4 +231,20 @@ test "all_by_actor_and_id/2" do
 
     assert [%Activity{id: ^id1}, %Activity{id: ^id2}] = activities
   end
+
+  test "get_by_object_ap_id_with_object/1" do
+    user = insert(:user)
+    another = insert(:user)
+
+    {:ok, %{id: id, object: %{data: %{"id" => obj_id}}}} =
+      Pleroma.Web.CommonAPI.post(user, %{status: "cofe"})
+
+    Pleroma.Web.CommonAPI.favorite(another, id)
+
+    assert obj_id
+           |> Pleroma.Activity.Queries.by_object_id()
+           |> Repo.aggregate(:count, :id) == 2
+
+    assert %{id: ^id} = Activity.get_by_object_ap_id_with_object(obj_id)
+  end
 end
diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
index 6a1044991..b577e25dd 100644
--- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
@@ -882,10 +882,12 @@ test "forwarded report from mastodon", %{conn: conn} do
       actor = insert(:user, local: false)
       remote_domain = URI.parse(actor.ap_id).host
       remote_actor = "https://#{remote_domain}/actor"
-      reported_user = insert(:user)
+      [reported_user, another] = insert_list(2, :user)
 
       note = insert(:note_activity, user: reported_user)
 
+      Pleroma.Web.CommonAPI.favorite(another, note.id)
+
       mock_json_body =
         "test/fixtures/mastodon/application_actor.json"
         |> File.read!()
@@ -920,8 +922,6 @@ test "forwarded report from mastodon", %{conn: conn} do
 
       ObanHelpers.perform(all_enqueued(worker: ReceiverWorker))
 
-      assert Pleroma.Repo.aggregate(Activity, :count, :id) == 2
-
       flag_activity = "Flag" |> Pleroma.Activity.Queries.by_type() |> Pleroma.Repo.one()
       reported_user_ap_id = reported_user.ap_id