projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0251690
)
Expose unannounce activity so that it can be tested
author
Francis Dinh
<normandy@firemail.cc>
Wed, 18 Apr 2018 07:39:42 +0000
(
03:39
-0400)
committer
Francis Dinh
<normandy@firemail.cc>
Wed, 18 Apr 2018 07:39:42 +0000
(
03:39
-0400)
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/utils.ex
patch
|
blob
|
history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index 2239da472a3fc27d79fe665fb84f88789e95259b..3b918e28f236249123b2a1128ca6a1a3fae44ba3 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-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),
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, _activity} <- Repo.delete(activity),
{:ok, object} <- remove_announce_from_object(activity, object) do
- {:ok, object}
+ {:ok,
unannounce_activity,
object}
else
_e -> {:ok, object}
end
else
_e -> {:ok, object}
end
diff --git
a/lib/pleroma/web/activity_pub/utils.ex
b/lib/pleroma/web/activity_pub/utils.ex
index 9e2fa1fb22967875b0e8050b11e8f15854122462..1f740eda551ee4f518c0fddb068c5e625463be33 100644
(file)
--- a/
lib/pleroma/web/activity_pub/utils.ex
+++ b/
lib/pleroma/web/activity_pub/utils.ex
@@
-283,13
+283,13
@@
defmodule Pleroma.Web.ActivityPub.Utils do
"""
def make_unannounce_data(
%User{ap_id: ap_id} = user,
"""
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,
) 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
}
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
"context" => context
}
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 6ddfc8b7514680d32ac56ebbb49648db2e6d57f6..c01552410f446b738dbd11e896cf45743adbddf5 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-297,7
+297,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unreblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) 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
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity})
end
diff --git
a/test/web/activity_pub/activity_pub_test.exs
b/test/web/activity_pub/activity_pub_test.exs
index 84f844322db8a3262a74e49bc747ee770358690a..85a6aecf08ad307829342dc8b3c4d9cc31c5483c 100644
(file)
--- a/
test/web/activity_pub/activity_pub_test.exs
+++ b/
test/web/activity_pub/activity_pub_test.exs
@@
-278,15
+278,24
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
user = insert(:user)
# Unannouncing an object that is not announced does nothing
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, 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 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
assert Repo.get(Activity, announce_activity.id) == nil
end
end