Add delete to ActivityPub.

[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 25560f4c96f5e7bc071a5011eb1d6eeb78a1fa57..146888c98eab2ea68ea866f32ad419cf5c5f7033 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -75,9 +75,26 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     end
   end
 
+  def delete(%Object{data: %{"id" => id, "actor" => actor}} = object, local \\ true) do
+    user = User.get_cached_by_ap_id(actor)
+    data = %{
+      "type" => "Delete",
+      "actor" => actor,
+      "object" => id,
+      "to" => [user.follower_address, "https://www.w3.org/ns/activitystreams#Public"]
+    }
+    with {:ok, activity} <- insert(data, local),
+         :ok <- maybe_federate(activity) do
+      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}
+    end
+  end
+
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{ context: context }),
+      where: fragment("? @> ?", activity.data, ^%{ type: "Create", context: context }),
       order_by: [desc: :inserted_at]
     Repo.all(query)
   end
@@ -112,14 +129,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_actor(query, %{"actor_id" => actor_id}) do
     from activity in query,
-      where: fragment("? @> ?", activity.data, ^%{actor: actor_id})
+      where: fragment("?->>'actor' = ?", activity.data, ^actor_id)
   end
   defp restrict_actor(query, _), do: query
 
   def fetch_activities(recipients, opts \\ %{}) do
     base_query = from activity in Activity,
       limit: 20,
-      order_by: [desc: :inserted_at]
+      order_by: [desc: :id]
 
     base_query
     |> restrict_recipients(recipients)