Revert "Simplify query."

[akkoma] / lib / pleroma / web / activity_pub / activity_pub.ex

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 5acbb859eda689ae2aad298356fe3ad535edd076..31aa2c4f127798be671ffc9c4ba4ce204c2afdcb 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -97,7 +97,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
       where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
-      order_by: [desc: :inserted_at]
+      order_by: [desc: :id]
     Repo.all(query)
   end
 
@@ -111,6 +111,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
   defp restrict_since(query, _), do: query
 
+  defp restrict_tag(query, %{"tag" => tag}) do
+    from activity in query,
+      where: fragment("? <@ (? #> '{\"object\",\"tag\"}')", ^tag, activity.data)
+  end
+  defp restrict_tag(query, _), do: query
+
   defp restrict_recipients(query, recipients) do
     Enum.reduce(recipients, query, fn (recipient, q) ->
       map = %{ to: [recipient] }
@@ -135,12 +141,21 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   end
   defp restrict_actor(query, _), do: query
 
+  defp restrict_type(query, %{"type" => type}) when is_binary(type) do
+    restrict_type(query, %{"type" => [type]})
+  end
   defp restrict_type(query, %{"type" => type}) do
     from activity in query,
-      where: fragment("?->>'type' = ?", activity.data, ^type)
+      where: fragment("?->>'type' = ANY(?)", activity.data, ^type)
   end
   defp restrict_type(query, _), do: query
 
+  defp restrict_favorited_by(query, %{"favorited_by" => ap_id}) do
+    from activity in query,
+      where: fragment("? <@ (? #> '{\"object\",\"likes\"}')", ^ap_id, activity.data)
+  end
+  defp restrict_favorited_by(query, _), do: query
+
   def fetch_activities(recipients, opts \\ %{}) do
     base_query = from activity in Activity,
       limit: 20,
@@ -148,11 +163,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
     base_query
     |> restrict_recipients(recipients)
+    |> restrict_tag(opts)
     |> restrict_since(opts)
     |> restrict_local(opts)
     |> restrict_max(opts)
     |> restrict_actor(opts)
     |> restrict_type(opts)
+    |> restrict_favorited_by(opts)
     |> Repo.all
     |> Enum.reverse
   end