Add id to objects, too.

[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 1f6ee47448ab9de0632b2cc052b7c63435d3cf03..e7427affbf58eccbacf75889290b1bfb0b2c8c3d 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -4,15 +4,55 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
   import Ecto.Query
 
   def insert(map) when is_map(map) do
+    map = Map.put_new_lazy(map, "id", &generate_activity_id/0)
+
+    map = if map["object"] do
+      object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
+      Map.put(map, "object", object)
+    else
+      map
+    end
+
     Repo.insert(%Activity{data: map})
   end
 
-  def fetch_public_activities do
+  def generate_activity_id do
+    host =
+      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
+      |> Keyword.fetch!(:url)
+      |> Keyword.fetch!(:host)
+    "https://#{host}/activities/#{Ecto.UUID.generate}"
+  end
+
+  def generate_object_id do
+    host =
+      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
+      |> Keyword.fetch!(:url)
+      |> Keyword.fetch!(:host)
+    "https://#{host}/objects/#{Ecto.UUID.generate}"
+  end
+
+  def fetch_public_activities(opts \\ %{}) do
+    public = ["https://www.w3.org/ns/activitystreams#Public"]
+    fetch_activities(public, opts)
+  end
+
+  def fetch_activities(recipients, opts \\ %{}) do
+    since_id = opts["since_id"] || 0
+
     query = from activity in Activity,
-      where: fragment(~s(? @> '{"to": ["https://www.w3.org/ns/activitystreams#Public"]}'), activity.data),
       limit: 20,
       order_by: [desc: :inserted_at]
 
+    query = Enum.reduce(recipients, query, fn (recipient, q) ->
+      map = %{ to: [recipient] }
+      from activity in q,
+      or_where: fragment(~s(? @> ?), activity.data, ^map)
+    end)
+
+    query = from activity in query,
+      where: activity.id > ^since_id
+
     Repo.all(query)
     |> Enum.reverse
   end