projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
activity_pub
/
side_effects_test.exs
diff --git
a/test/web/activity_pub/side_effects_test.exs
b/test/web/activity_pub/side_effects_test.exs
index 2889a577c290f2437d27f8924b546ca014bfc54c..19abac6a65d268116c98cdd107c34c4ea60b25e6 100644
(file)
--- a/
test/web/activity_pub/side_effects_test.exs
+++ b/
test/web/activity_pub/side_effects_test.exs
@@
-47,14
+47,14
@@
defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
- {:ok, chat_message_object} = Object.create(chat_message_data)
{:ok, create_activity_data, _meta} =
{:ok, create_activity_data, _meta} =
- Builder.create(author, chat_message_
object.
data["id"], [recipient.ap_id])
+ Builder.create(author, chat_message_data["id"], [recipient.ap_id])
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
- {:ok, _create_activity, _meta} = SideEffects.handle(create_activity)
+ {:ok, _create_activity, _meta} =
+ SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
assert Repo.get_by(Notification, user_id: recipient.id, activity_id: create_activity.id)
end
assert Repo.get_by(Notification, user_id: recipient.id, activity_id: create_activity.id)
end
@@
-64,14
+64,17
@@
defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
- {:ok, chat_message_object} = Object.create(chat_message_data)
{:ok, create_activity_data, _meta} =
{:ok, create_activity_data, _meta} =
- Builder.create(author, chat_message_
object.
data["id"], [recipient.ap_id])
+ Builder.create(author, chat_message_data["id"], [recipient.ap_id])
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
- {:ok, _create_activity, _meta} = SideEffects.handle(create_activity)
+ {:ok, _create_activity, _meta} =
+ SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
+
+ # An object is created
+ assert Object.get_by_ap_id(chat_message_data["id"])
# The remote user won't get a chat
chat = Chat.get(author.id, recipient.ap_id)
# The remote user won't get a chat
chat = Chat.get(author.id, recipient.ap_id)
@@
-85,14
+88,14
@@
defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
recipient = insert(:user, local: true)
{:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
- {:ok, chat_message_object} = Object.create(chat_message_data)
{:ok, create_activity_data, _meta} =
{:ok, create_activity_data, _meta} =
- Builder.create(author, chat_message_
object.
data["id"], [recipient.ap_id])
+ Builder.create(author, chat_message_data["id"], [recipient.ap_id])
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
{:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
- {:ok, _create_activity, _meta} = SideEffects.handle(create_activity)
+ {:ok, _create_activity, _meta} =
+ SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
# Both users are local and get the chat
chat = Chat.get(author.id, recipient.ap_id)
# Both users are local and get the chat
chat = Chat.get(author.id, recipient.ap_id)