aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/object.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-27 19:37:55 +0000
committerkaniini <nenolod@gmail.com>2018-12-27 19:37:55 +0000
commitbee6acd51dc4e84e44caecf9d123dfff2f640a38 (patch)
tree2436614e22c005e7417cd863301f8b27fd919704 /lib/pleroma/object.ex
parentcff0292d4b32cf51de8ad15281c35d783b137dd2 (diff)
parent012b7ab5e64eae468c630730f392ea8289a5d874 (diff)
downloadpleroma-bee6acd51dc4e84e44caecf9d123dfff2f640a38.tar.gz
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
Create tombstone instead of object deletion See merge request pleroma/pleroma!593
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r--lib/pleroma/object.ex21
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index cc4a2181a..e2b648727 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -4,7 +4,7 @@
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
@@ -66,8 +66,25 @@ defmodule Pleroma.Object do
Object.change(%Object{}, %{data: %{"id" => context}})
end
+ 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_object_with_tombstone(object) do
+ tombstone = make_tombstone(object)
+
+ object
+ |> Object.change(%{data: tombstone})
+ |> Repo.update()
+ end
+
def delete(%Object{data: %{"id" => id}} = object) do
- with Repo.delete(object),
+ 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}