Revert Activity tombstones, add ObjectTombstone struct

This commit is contained in:
Maxim Filippov 2018-12-25 03:00:06 +03:00
parent 2bbec33c71
commit f75f707f6c
9 changed files with 43 additions and 62 deletions

View file

@ -1,7 +1,7 @@
defmodule Pleroma.Activity do defmodule Pleroma.Activity do
use Ecto.Schema use Ecto.Schema
alias Pleroma.{Repo, Activity, Notification} alias Pleroma.{Repo, Activity, Notification}
import Ecto.{Query, Changeset} import Ecto.Query
# https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19 # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
@mastodon_notification_types %{ @mastodon_notification_types %{
@ -103,25 +103,4 @@ defmodule Pleroma.Activity do
end end
def mastodon_notification_type(%Activity{}), do: nil def mastodon_notification_type(%Activity{}), do: nil
def get_tombstone(%Activity{data: data}, deleted \\ DateTime.utc_now()) do
%{
id: data["id"],
context: data["context"],
type: "Tombstone",
published: data["published"],
deleted: deleted
}
end
def swap_data_with_tombstone(activity) do
with tombstone = get_tombstone(activity),
Notification.clear(activity),
{:ok, changed_activity} =
activity
|> change(%{data: tombstone})
|> Repo.update() do
{:ok, changed_activity}
end
end
end end

View file

@ -1,6 +1,6 @@
defmodule Pleroma.Object do defmodule Pleroma.Object do
use Ecto.Schema use Ecto.Schema
alias Pleroma.{Repo, Object, User, Activity} alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
import Ecto.{Query, Changeset} import Ecto.{Query, Changeset}
schema "objects" do schema "objects" do
@ -62,16 +62,17 @@ defmodule Pleroma.Object do
Object.change(%Object{}, %{data: %{"id" => context}}) Object.change(%Object{}, %{data: %{"id" => context}})
end end
def get_tombstone(%Object{data: data}, deleted \\ DateTime.utc_now()) do def make_tombstone(%Object{data: %{"id" => id, "type" => type}}, deleted \\ DateTime.utc_now()) do
%{ %ObjectTombstone{
id: data["id"], id: id,
type: "Tombstone", formerType: type,
deleted: deleted deleted: deleted
} }
|> Map.from_struct()
end end
def swap_data_with_tombstone(object) do def swap_object_with_tombstone(object) do
tombstone = get_tombstone(object) tombstone = make_tombstone(object)
object object
|> Object.change(%{data: tombstone}) |> Object.change(%{data: tombstone})
@ -79,10 +80,8 @@ defmodule Pleroma.Object do
end end
def delete(%Object{data: %{"id" => id}} = object) do def delete(%Object{data: %{"id" => id}} = object) do
with swap_data_with_tombstone(object), with {:ok, _obj} = swap_object_with_tombstone(object),
Activity.all_non_create_by_object_ap_id_q(id) Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
|> Repo.all()
|> Enum.each(&Activity.swap_data_with_tombstone/1),
{:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
{:ok, object} {:ok, object}
end end

View file

@ -0,0 +1,4 @@
defmodule Pleroma.ObjectTombstone do
@enforce_keys [:id, :formerType, :deleted]
defstruct [:id, :formerType, :deleted, type: "Tombstone"]
end

View file

@ -25,28 +25,4 @@ defmodule Pleroma.ActivityTest do
assert activity == found_activity assert activity == found_activity
end end
test "returns tombstone" do
activity = insert(:note_activity)
deleted = DateTime.utc_now()
assert Pleroma.Activity.get_tombstone(activity, deleted) == %{
id: activity.data["id"],
context: activity.data["context"],
type: "Tombstone",
published: activity.data["published"],
deleted: deleted
}
end
test "swaps data with tombstone" do
activity = insert(:note_activity)
{:ok, deleted} = Pleroma.Activity.swap_data_with_tombstone(activity)
assert deleted.data.type == "Tombstone"
found_activity = Repo.get(Activity, activity.id)
assert deleted.data.type == found_activity.data["type"]
end
end end

View file

@ -32,6 +32,8 @@ defmodule Pleroma.ObjectTest do
found_object = Object.get_by_ap_id(object.data["id"]) found_object = Object.get_by_ap_id(object.data["id"])
refute object == found_object refute object == found_object
assert found_object.data["type"] == "Tombstone"
end end
test "ensures cache is cleared for the object" do test "ensures cache is cleared for the object" do
@ -47,6 +49,8 @@ defmodule Pleroma.ObjectTest do
cached_object = Object.get_cached_by_ap_id(object.data["id"]) cached_object = Object.get_cached_by_ap_id(object.data["id"])
refute object == cached_object refute object == cached_object
assert cached_object.data["type"] == "Tombstone"
end end
end end
end end

View file

@ -625,7 +625,7 @@ defmodule Pleroma.UserTest do
# TODO: Remove favorites, repeats, delete activities. # TODO: Remove favorites, repeats, delete activities.
assert Repo.get(Activity, activity.id).data["type"] == "Tombstone" refute Repo.get(Activity, activity.id)
end end
test "get_public_key_for_ap_id fetches a user that's not in the db" do test "get_public_key_for_ap_id fetches a user that's not in the db" do

View file

@ -363,7 +363,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
{:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data) {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
assert Repo.get(Activity, activity.id).data["type"] == "Tombstone" refute Repo.get(Activity, activity.id)
end end
test "it fails for incoming deletes with spoofed origin" do test "it fails for incoming deletes with spoofed origin" do

View file

@ -292,7 +292,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert %{} = json_response(conn, 200) assert %{} = json_response(conn, 200)
assert Repo.get(Activity, activity.id).data["type"] == "Tombstone" refute Repo.get(Activity, activity.id)
end end
test "when you didn't create it", %{conn: conn} do test "when you didn't create it", %{conn: conn} do
@ -308,6 +308,25 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert Repo.get(Activity, activity.id) == activity assert Repo.get(Activity, activity.id) == activity
end end
# test "404 when making an attempt to get it" do
# activity = insert(:note_activity)
# author = User.get_by_ap_id(activity.data["actor"])
# conn =
# conn
# |> assign(:user, author)
# |> delete("/api/v1/statuses/#{activity.id}")
# assert %{} = json_response(conn, 200)
# conn =
# build_conn()
# |> assign(:user, author)
# |> get("/api/v1/statuses/#{activity.id}")
# assert %{} = json_response(conn, 200)
# end
end end
describe "filters" do describe "filters" do

View file

@ -23,8 +23,8 @@ defmodule Pleroma.Web.OStatus.DeleteHandlingTest do
{:ok, [delete]} = OStatus.handle_incoming(incoming) {:ok, [delete]} = OStatus.handle_incoming(incoming)
assert Repo.get(Activity, note.id).data["type"] == "Tombstone" refute Repo.get(Activity, note.id)
assert Repo.get(Activity, like.id).data["type"] == "Tombstone" refute Repo.get(Activity, like.id)
assert Object.get_by_ap_id(note.data["object"]["id"]).data["type"] == "Tombstone" assert Object.get_by_ap_id(note.data["object"]["id"]).data["type"] == "Tombstone"
assert Repo.get(Activity, second_note.id) assert Repo.get(Activity, second_note.id)
assert Object.get_by_ap_id(second_note.data["object"]["id"]) assert Object.get_by_ap_id(second_note.data["object"]["id"])