X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fobject.ex;h=707a61f14c44d02d3b4cf769c5b4ab41d14aebb2;hb=465adedb7cc457303278444d0f56960f87fde1e9;hp=d9f0e91b07bced3b4e2c77c4db295ba58670dfd4;hpb=c119ea3a5727d521c36d60eca22fa3f20d507b63;p=akkoma
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index d9f0e91b0..707a61f14 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -1,10 +1,10 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Object do
use Ecto.Schema
- alias Pleroma.{Repo, Object, User, Activity, HTML}
+ alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
import Ecto.{Query, Changeset}
schema "objects" do
@@ -66,45 +66,28 @@ defmodule Pleroma.Object do
Object.change(%Object{}, %{data: %{"id" => context}})
end
- def delete(%Object{data: %{"id" => id}} = object) do
- with Repo.delete(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
- end
-
- def get_cached_scrubbed_html(content, scrubbers, object) do
- key = "#{generate_scrubber_signature(scrubbers)}|#{object.id}"
- Cachex.fetch!(:scrubber_cache, key, fn _key -> ensure_scrubbed_html(content, scrubbers) end)
- end
-
- def get_cached_stripped_html(content, object) do
- get_cached_scrubbed_html(content, HtmlSanitizeEx.Scrubber.StripTags, object)
+ 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 ensure_scrubbed_html(
- content,
- scrubbers
- ) do
- {:commit, HTML.filter_tags(content, scrubbers)}
- end
+ def swap_object_with_tombstone(object) do
+ tombstone = make_tombstone(object)
- defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
- generate_scrubber_signature([scrubber])
+ object
+ |> Object.change(%{data: tombstone})
+ |> Repo.update()
end
- defp generate_scrubber_signature(scrubbers) do
- Enum.reduce(scrubbers, "", fn scrubber, signature ->
- # If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
- version =
- if Kernel.function_exported?(scrubber, :version, 0) do
- scrubber.version
- else
- 0
- end
-
- "#{signature}#{to_string(scrubber)}#{version}"
- end)
+ def delete(%Object{data: %{"id" => id}} = object) do
+ with {:ok, _obj} = swap_object_with_tombstone(object),
+ Repo.delete_all(Activity.by_object_ap_id(id)),
+ {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
+ {:ok, object}
+ end
end
end