From fcf3128a5687d1ad7883772585933d8c475863db Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 4 Sep 2017 20:03:28 +0200 Subject: [PATCH] Add TwAPI representer for deletes. --- .../representers/activity_representer.ex | 18 ++++++++++++++++++ .../representers/activity_representer_test.exs | 13 +++++++++++++ 2 files changed, 31 insertions(+) diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index bc3de0e90..321917e83 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -96,6 +96,24 @@ def to_map(%Activity{data: %{"type" => "Undo", "published" => created_at, "objec } end + def to_map(%Activity{data: %{"type" => "Delete", "published" => created_at, "object" => deleted_object }} = activity, %{user: user} = opts) do + created_at = created_at |> Utils.date_to_asctime + + %{ + "id" => activity.data["object"], + "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), + "attentions" => [], + "statusnet_html" => "deleted notice {{tag", + "text" => "deleted notice {{tag" , + "is_local" => activity.local, + "is_post_verb" => false, + "created_at" => created_at, + "in_reply_to_status_id" => nil, + "external_url" => activity.data["id"], + "activity_type" => "delete" + } + end + def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %{user: user} = opts) do created_at = object["published"] |> Utils.date_to_asctime like_count = object["like_count"] || 0 diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 4f090ee8e..906f8dd98 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -148,4 +148,17 @@ test "an undo for a follow" do assert map["is_post_verb"] == false assert map["activity_type"] == "undo" end + + test "a delete activity" do + object = insert(:note) + user = User.get_by_ap_id(object.data["actor"]) + + {:ok, delete} = ActivityPub.delete(object) + + map = ActivityRepresenter.to_map(delete, %{user: user}) + + assert map["is_post_verb"] == false + assert map["activity_type"] == "delete" + assert map["id"] == object.data["id"] + end end