X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=4f7be4293332cb09bc75e86e337fe8a1589e7d62;hb=ed1eb5deea35ff2c3487ef550fad3a543a80cb32;hp=db1302738d7276176d297fcae3a9154df5ea9c99;hpb=3438a120cc37d696eba711eaf7be119dbba1381f;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index db1302738..4f7be4293 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,5 +1,5 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
-  alias Pleroma.{Activity, Repo, Object, Upload, User, Web}
+  alias Pleroma.{Activity, Repo, Object, Upload, User, Web, Notification}
   alias Ecto.{Changeset, UUID}
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
@@ -9,7 +9,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     with nil <- Activity.get_by_ap_id(map["id"]),
          map <- lazy_put_activity_defaults(map),
          :ok <- insert_full_object(map) do
-      Repo.insert(%Activity{data: map, local: local})
+      {:ok, activity} = Repo.insert(%Activity{data: map, local: local})
+      Notification.create_notifications(activity)
+      {:ok, activity}
     else
       %Activity{} = activity -> {:ok, activity}
       error -> {:error, error}
@@ -85,17 +87,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     }
     with Repo.delete(object),
          Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
-         Repo.delete_all(Activity.all_by_object_ap_id_q(id)),
          {:ok, activity} <- insert(data, local),
          :ok <- maybe_federate(activity) do
       {:ok, activity}
     end
   end
 
-  def fetch_activities_for_context(context) do
+  def fetch_activities_for_context(context, opts \\ %{}) do
     query = from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{ type: "Create", context: context }),
-      order_by: [desc: :inserted_at]
+      where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
+      order_by: [desc: :id]
+    query = restrict_blocked(query, opts)
     Repo.all(query)
   end
 
@@ -109,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] }
@@ -133,6 +141,36 @@ 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' = 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
+
+  # Only search through last 100_000 activities by default
+  defp restrict_recent(query, _) do
+    since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
+
+    from activity in query,
+      where: activity.id > ^since
+  end
+
+  defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
+    blocks = info["blocks"] || []
+    from activity in query,
+      where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks)
+  end
+  defp restrict_blocked(query, _), do: query
+
   def fetch_activities(recipients, opts \\ %{}) do
     base_query = from activity in Activity,
       limit: 20,
@@ -140,10 +178,15 @@ 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)
+    |> restrict_recent(opts)
+    |> restrict_blocked(opts)
     |> Repo.all
     |> Enum.reverse
   end