X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=ff5eb9b27b43a243d22483c27bf38923363e5d1b;hb=4c95545d194e8a807e9e3514ed75347d78ec0856;hp=436cf6d5d994e940d35da565b989e2c45659b0c7;hpb=0f412cf6e68fcebda3e94b71b7f182af689748bf;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 436cf6d5d..ff5eb9b27 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -1,6 +1,10 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Object do
   use Ecto.Schema
-  alias Pleroma.{Repo, Object, User, Activity}
+  alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
   import Ecto.{Query, Changeset}
 
   schema "objects" do
@@ -62,16 +66,17 @@ defmodule Pleroma.Object do
     Object.change(%Object{}, %{data: %{"id" => context}})
   end
 
-  def get_tombstone(%Object{data: data}, deleted \\ DateTime.utc_now()) do
-    %{
-      id: data["id"],
-      type: "tombstone",
+  def make_tombstone(%Object{data: %{"id" => id, "type" => type}}, deleted \\ DateTime.utc_now()) do
+    %ObjectTombstone{
+      id: id,
+      formerType: type,
       deleted: deleted
     }
+    |> Map.from_struct()
   end
 
-  def swap_data_with_tombstone(object) do
-    tombstone = get_tombstone(object)
+  def swap_object_with_tombstone(object) do
+    tombstone = make_tombstone(object)
 
     object
     |> Object.change(%{data: tombstone})
@@ -79,10 +84,8 @@ defmodule Pleroma.Object do
   end
 
   def delete(%Object{data: %{"id" => id}} = object) do
-    with swap_data_with_tombstone(object),
-         Activity.all_non_create_by_object_ap_id_q(id)
-         |> Repo.all()
-         |> Enum.each(&Activity.swap_data_with_tombstone/1),
+    with {:ok, _obj} = swap_object_with_tombstone(object),
+         Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
          {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
       {:ok, object}
     end