X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Factivity%2Fqueries.ex;h=a34c20343471582e7c0dbb8e0bebd647d5cd83e0;hb=0e23138b50f1fdd9ea78df31eec1b3caac905e2c;hp=c17affec98501b973f346b259793b57d8ce73d9c;hpb=4e6bbdc7b549e630141cb10d383a42055f06dc16;p=akkoma

diff --git a/lib/pleroma/activity/queries.ex b/lib/pleroma/activity/queries.ex
index c17affec9..a34c20343 100644
--- a/lib/pleroma/activity/queries.ex
+++ b/lib/pleroma/activity/queries.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Activity.Queries do
@@ -30,11 +30,18 @@ defmodule Pleroma.Activity.Queries do
     )
   end
 
-  @spec by_author(query, String.t()) :: query
+  @spec by_author(query, User.t()) :: query
   def by_author(query \\ Activity, %User{ap_id: ap_id}) do
     from(a in query, where: a.actor == ^ap_id)
   end
 
+  def find_by_object_ap_id(activities, object_ap_id) do
+    Enum.find(
+      activities,
+      &(object_ap_id in [is_map(&1.data["object"]) && &1.data["object"]["id"], &1.data["object"]])
+    )
+  end
+
   @spec by_object_id(query, String.t() | [String.t()]) :: query
   def by_object_id(query \\ Activity, object_id)
 
@@ -63,7 +70,7 @@ defmodule Pleroma.Activity.Queries do
     )
   end
 
-  @spec by_object_id(query, String.t()) :: query
+  @spec by_object_in_reply_to_id(query, String.t(), keyword()) :: query
   def by_object_in_reply_to_id(query, in_reply_to_id, opts \\ []) do
     query =
       if opts[:skip_preloading] do