sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 12:36:11 +01:00
Code Issues Releases Wiki Activity

Expose unannounce activity so that it can be tested

Browse Source
This commit is contained in:
Francis Dinh 2018-04-18 03:39:42 -04:00
parent 0251690e96
commit 687db1bc3a
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -142,11 +142,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def unannounce(%User{} = actor, %Object{} = object, local \\ true) do
with %Activity{} = activity <- get_existing_announce(actor.ap_id, object),
unannounce_data <- make_unannounce_data(actor, activity),
{:ok, _unannounce_activity} <- insert(unannounce_data, local),
unannounce_data <- make_unannounce_data(actor, object),
{:ok, unannounce_activity} <- insert(unannounce_data, local),
{:ok, _activity} <- Repo.delete(activity),
{:ok, object} <- remove_announce_from_object(activity, object) do
{:ok, object}
{:ok, unannounce_activity, object}
else
_e -> {:ok, object}
end

4
lib/pleroma/web/activity_pub/utils.ex
View File

@ -283,13 +283,13 @@ defmodule Pleroma.Web.ActivityPub.Utils do
"""
def make_unannounce_data(
%User{ap_id: ap_id} = user,
%Activity{data: %{"id" => id, "context" => context}} = activity
%Object{data: %{"id" => id, "context" => context}} = object
) do
%{
"type" => "Undo",
"actor" => ap_id,
"object" => id,
"to" => [user.follower_address, activity.data["actor"]],
"to" => [user.follower_address, object.data["actor"]],
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
"context" => context
}

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -297,7 +297,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unreblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
with {:ok, %{data: %{"id" => id}}} = CommonAPI.unrepeat(ap_id_or_id, user),
with {:ok, _, %{data: %{"id" => id}}} = CommonAPI.unrepeat(ap_id_or_id, user),
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity})
end

15
test/web/activity_pub/activity_pub_test.exs
View File

@ -278,15 +278,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
user = insert(:user)
# Unannouncing an object that is not announced does nothing
{:ok, object} = ActivityPub.unannounce(user, object)
assert object.data["announcement_count"] == 0
#{:ok, object} = ActivityPub.unannounce(user, object)
#assert object.data["announcement_count"] == 0
{:ok, announce_activity, object} = ActivityPub.announce(user, object)
assert object.data["announcement_count"] == 1
{:ok, object} = ActivityPub.unannounce(user, object)
{:ok, unannounce_activity, object} = ActivityPub.unannounce(user, object)
assert object.data["announcement_count"] == 0
assert unannounce_activity.data["to"] == [
User.ap_followers(user),
note_activity.data["actor"]
]
assert unannounce_activity.data["type"] == "Undo"
assert unannounce_activity.data["object"] == object.data["id"]
assert unannounce_activity.data["actor"] == user.ap_id
assert unannounce_activity.data["context"] == object.data["context"]
assert Repo.get(Activity, announce_activity.id) == nil
end
end