Add recipients field to activities.

Also do some very basic checks for AP message insertion.

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index afd09982fcd45211249c0c4cac75f80fefaf65db..a8154859a7f81429eac2b293c2a32cd44f8a34f9 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Activity do
     field :data, :map
     field :local, :boolean, default: true
     field :actor, :string
+    field :recipients, {:array, :string}
     has_many :notifications, Notification, on_delete: :delete_all
 
     timestamps()

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 421fd5cd72583b1f5d64dafbbcc72f93080af7b4..7b85770b71b9f62d55740172f7c5384b21c47dfa 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,14 +1,19 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.{Activity, Repo, Object, Upload, User, Notification}
+  alias Pleroma.Web.OStatus
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
   require Logger
 
+  def get_recipients(data) do
+    (data["to"] || []) ++ (data["cc"] || [])
+  end
+
   def insert(map, local \\ true) when is_map(map) do
     with nil <- Activity.get_by_ap_id(map["id"]),
          map <- lazy_put_activity_defaults(map),
          :ok <- insert_full_object(map) do
-      {:ok, activity} = Repo.insert(%Activity{data: map, local: local, actor: map["actor"]})
+      {:ok, activity} = Repo.insert(%Activity{data: map, local: local, actor: map["actor"], recipients: get_recipients(map)})
       Notification.create_notifications(activity)
       stream_out(activity)
       {:ok, activity}
@@ -215,4 +220,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     data = Upload.store(file)
     Repo.insert(%Object{data: data})
   end
+
+  def prepare_incoming(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do
+    with {:ok, user} <- OStatus.find_or_make_user(data["actor"]) do
+      data
+    else
+      _e -> :error
+    end
+  end
+
+  def prepare_incoming(_) do
+    :error
+  end
 end

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 0f631dd4bef48d3ce7b4a664d8e9c24187ba38ee..0d3e8f44cf26bb2be74de2a1587e36d409f027f3 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -20,7 +20,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   # TODO: Move signature failure halt into plug
   def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
-    {:ok, activity} = ActivityPub.insert(params, false)
-    json(conn, "ok")
+    with {:ok, data} <- ActivityPub.prepare_incoming(params),
+         {:ok, activity} <- ActivityPub.insert(data, false) do
+      json(conn, "ok")
+    end
   end
 end

diff --git a/priv/repo/migrations/20171212163643_add_recipients_to_activities.exs b/priv/repo/migrations/20171212163643_add_recipients_to_activities.exs
new file mode 100644 (file)
index 0000000..7bce781
--- /dev/null
+++ b/priv/repo/migrations/20171212163643_add_recipients_to_activities.exs
@@ -0,0 +1,11 @@
+defmodule Pleroma.Repo.Migrations.AddRecipientsToActivities do
+  use Ecto.Migration
+
+  def change do
+    alter table(:activities) do
+      add :recipients, {:array, :string}
+    end
+
+    create index(:activities, [:recipients], using: :gin)
+  end
+end

diff --git a/priv/repo/migrations/20171212164525_fill_recipients_in_activities.exs b/priv/repo/migrations/20171212164525_fill_recipients_in_activities.exs
new file mode 100644 (file)
index 0000000..1fcc0da
--- /dev/null
+++ b/priv/repo/migrations/20171212164525_fill_recipients_in_activities.exs
@@ -0,0 +1,21 @@
+defmodule Pleroma.Repo.Migrations.FillRecipientsInActivities do
+  use Ecto.Migration
+  alias Pleroma.{Repo, Activity}
+
+  def up do
+    max = Repo.aggregate(Activity, :max, :id)
+    if max do
+      IO.puts("#{max} activities")
+      chunks = 0..(round(max / 10_000))
+
+      Enum.each(chunks, fn (i) ->
+        min = i * 10_000
+        max = min + 10_000
+        execute("""
+        update activities set recipients = array(select jsonb_array_elements_text(data->'to')) where id > #{min} and id <= #{max};
+        """)
+        |> IO.inspect
+      end)
+    end
+  end
+end

diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index f50509b630522f22b5df2744202a0bdd0c558418..a38ca84ad5b785af5e479beaec1a52258a618d1b 100644 (file)
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -53,6 +53,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       {:ok, activity} = ActivityPub.create(["user1", "user1", "user2"], %User{ap_id: "1"}, "", %{})
       assert activity.data["to"] == ["user1", "user2"]
       assert activity.actor == "1"
+      assert activity.recipients == ["user1", "user2"]
     end
   end