X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Factivity_pub%2Fside_effects_test.exs;h=e542c06f587de417b44437c7232e723981750502;hb=0f132b802dde7f217ecb07767e0d34e3edb517b7;hp=13167f50a8405e1598eca733957f07b3f310caa5;hpb=b5899fda1a38c2ce2d26ebd5082d864c84105622;p=akkoma

diff --git a/test/pleroma/web/activity_pub/side_effects_test.exs b/test/pleroma/web/activity_pub/side_effects_test.exs
index 13167f50a..e542c06f5 100644
--- a/test/pleroma/web/activity_pub/side_effects_test.exs
+++ b/test/pleroma/web/activity_pub/side_effects_test.exs
@@ -7,8 +7,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
   use Pleroma.DataCase
 
   alias Pleroma.Activity
-  alias Pleroma.Chat
-  alias Pleroma.Chat.MessageReference
   alias Pleroma.Notification
   alias Pleroma.Object
   alias Pleroma.Repo
@@ -17,6 +15,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Builder
   alias Pleroma.Web.ActivityPub.SideEffects
+  alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI
 
   import Mock
@@ -27,15 +26,22 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
       author = insert(:user, local: true)
       recipient = insert(:user, local: true)
 
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
+      {:ok, note_data, _meta} =
+        Builder.note(%Pleroma.Web.CommonAPI.ActivityDraft{
+          user: author,
+          to: [recipient.ap_id],
+          mentions: [recipient],
+          content_html: "hey",
+          extra: %{"id" => Utils.generate_object_id()}
+        })
 
       {:ok, create_activity_data, _meta} =
-        Builder.create(author, chat_message_data["id"], [recipient.ap_id])
+        Builder.create(author, note_data["id"], [recipient.ap_id])
 
       {:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
 
       {:ok, _create_activity, meta} =
-        SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
+        SideEffects.handle(create_activity, local: false, object_data: note_data)
 
       assert [notification] = meta[:notifications]
 
@@ -58,7 +64,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
         SideEffects.handle_after_transaction(meta)
 
         assert called(Pleroma.Web.Streamer.stream(["user", "user:notification"], notification))
-        assert called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], :_))
         assert called(Pleroma.Web.Push.send(notification))
       end
     end
@@ -88,6 +93,16 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
       assert User.blocks?(user, blocked)
     end
 
+    test "it updates following relationship", %{user: user, blocked: blocked, block: block} do
+      {:ok, _, _} = SideEffects.handle(block)
+
+      refute Pleroma.FollowingRelationship.get(user, blocked)
+      assert User.get_follow_state(user, blocked) == nil
+      assert User.get_follow_state(blocked, user) == nil
+      assert User.get_follow_state(user, blocked, nil) == nil
+      assert User.get_follow_state(blocked, user, nil) == nil
+    end
+
     test "it blocks but does not unfollow if the relevant setting is set", %{
       user: user,
       blocked: blocked,
@@ -148,7 +163,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
       object = Object.get_by_ap_id(emoji_react.data["object"])
 
       assert object.data["reaction_count"] == 1
-      assert ["👌", [user.ap_id]] in object.data["reactions"]
+      assert ["👌", [user.ap_id], nil] in object.data["reactions"]
     end
 
     test "creates a notification", %{emoji_react: emoji_react, poster: poster} do
@@ -157,6 +172,30 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
     end
   end
 
+  describe "Question objects" do
+    setup do
+      user = insert(:user)
+      question = build(:question, user: user)
+      question_activity = build(:question_activity, question: question)
+      activity_data = Map.put(question_activity.data, "object", question.data["id"])
+      meta = [object_data: question.data, local: false]
+
+      {:ok, activity, meta} = ActivityPub.persist(activity_data, meta)
+
+      %{activity: activity, meta: meta}
+    end
+
+    test "enqueues the poll end", %{activity: activity, meta: meta} do
+      {:ok, activity, meta} = SideEffects.handle(activity, meta)
+
+      assert_enqueued(
+        worker: Pleroma.Workers.PollWorker,
+        args: %{op: "poll_end", activity_id: activity.id},
+        scheduled_at: NaiveDateTime.from_iso8601!(meta[:object_data]["closed"])
+      )
+    end
+  end
+
   describe "delete users with confirmation pending" do
     setup do
       user = insert(:user, is_confirmed: false)
@@ -302,147 +341,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
     end
   end
 
-  describe "creation of ChatMessages" do
-    test "notifies the recipient" do
-      author = insert(:user, local: false)
-      recipient = insert(:user, local: true)
-
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
-
-      {:ok, create_activity_data, _meta} =
-        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} =
-        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
-
-    test "it streams the created ChatMessage" do
-      author = insert(:user, local: true)
-      recipient = insert(:user, local: true)
-
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
-
-      {:ok, create_activity_data, _meta} =
-        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} =
-        SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
-
-      assert [_, _] = meta[:streamables]
-    end
-
-    test "it creates a Chat and MessageReferences for the local users and bumps the unread count, except for the author" do
-      author = insert(:user, local: true)
-      recipient = insert(:user, local: true)
-
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
-
-      {:ok, create_activity_data, _meta} =
-        Builder.create(author, chat_message_data["id"], [recipient.ap_id])
-
-      {:ok, create_activity, _meta} = ActivityPub.persist(create_activity_data, local: false)
-
-      with_mocks([
-        {
-          Pleroma.Web.Streamer,
-          [],
-          [
-            stream: fn _, _ -> nil end
-          ]
-        },
-        {
-          Pleroma.Web.Push,
-          [],
-          [
-            send: fn _ -> nil end
-          ]
-        }
-      ]) do
-        {:ok, _create_activity, meta} =
-          SideEffects.handle(create_activity, local: false, object_data: chat_message_data)
-
-        # The notification gets created
-        assert [notification] = meta[:notifications]
-        assert notification.activity_id == create_activity.id
-
-        # But it is not sent out
-        refute called(Pleroma.Web.Streamer.stream(["user", "user:notification"], notification))
-        refute called(Pleroma.Web.Push.send(notification))
-
-        # Same for the user chat stream
-        assert [{topics, _}, _] = meta[:streamables]
-        assert topics == ["user", "user:pleroma_chat"]
-        refute called(Pleroma.Web.Streamer.stream(["user", "user:pleroma_chat"], :_))
-
-        chat = Chat.get(author.id, recipient.ap_id)
-
-        [cm_ref] = MessageReference.for_chat_query(chat) |> Repo.all()
-
-        assert cm_ref.object.data["content"] == "hey"
-        assert cm_ref.unread == false
-
-        chat = Chat.get(recipient.id, author.ap_id)
-
-        [cm_ref] = MessageReference.for_chat_query(chat) |> Repo.all()
-
-        assert cm_ref.object.data["content"] == "hey"
-        assert cm_ref.unread == true
-      end
-    end
-
-    test "it creates a Chat for the local users and bumps the unread count" do
-      author = insert(:user, local: false)
-      recipient = insert(:user, local: true)
-
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
-
-      {:ok, create_activity_data, _meta} =
-        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} =
-        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)
-      refute chat
-
-      # The local user will get a chat
-      chat = Chat.get(recipient.id, author.ap_id)
-      assert chat
-
-      author = insert(:user, local: true)
-      recipient = insert(:user, local: true)
-
-      {:ok, chat_message_data, _meta} = Builder.chat_message(author, recipient.ap_id, "hey")
-
-      {:ok, create_activity_data, _meta} =
-        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} =
-        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)
-      assert chat
-
-      chat = Chat.get(recipient.id, author.ap_id)
-      assert chat
-    end
-  end
-
   describe "announce objects" do
     setup do
       poster = insert(:user)
@@ -518,4 +416,74 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
       end
     end
   end
+
+  describe "removing a follower" do
+    setup do
+      user = insert(:user)
+      followed = insert(:user)
+
+      {:ok, _, _, follow_activity} = CommonAPI.follow(user, followed)
+
+      {:ok, reject_data, []} = Builder.reject(followed, follow_activity)
+      {:ok, reject, _meta} = ActivityPub.persist(reject_data, local: true)
+
+      %{user: user, followed: followed, reject: reject}
+    end
+
+    test "", %{user: user, followed: followed, reject: reject} do
+      assert User.following?(user, followed)
+      assert Pleroma.FollowingRelationship.get(user, followed)
+
+      {:ok, _, _} = SideEffects.handle(reject)
+
+      refute User.following?(user, followed)
+      refute Pleroma.FollowingRelationship.get(user, followed)
+      assert User.get_follow_state(user, followed) == nil
+      assert User.get_follow_state(user, followed, nil) == nil
+    end
+  end
+
+  describe "removing a follower from remote" do
+    setup do
+      user = insert(:user)
+      followed = insert(:user, local: false)
+
+      # Mock a local-to-remote follow
+      {:ok, follow_data, []} = Builder.follow(user, followed)
+
+      follow_data =
+        follow_data
+        |> Map.put("state", "accept")
+
+      {:ok, follow, _meta} = ActivityPub.persist(follow_data, local: true)
+      {:ok, _, _} = SideEffects.handle(follow)
+
+      # Mock a remote-to-local accept
+      {:ok, accept_data, _} = Builder.accept(followed, follow)
+      {:ok, accept, _} = ActivityPub.persist(accept_data, local: false)
+      {:ok, _, _} = SideEffects.handle(accept)
+
+      # Mock a remote-to-local reject
+      {:ok, reject_data, []} = Builder.reject(followed, follow)
+      {:ok, reject, _meta} = ActivityPub.persist(reject_data, local: false)
+
+      %{user: user, followed: followed, reject: reject}
+    end
+
+    test "", %{user: user, followed: followed, reject: reject} do
+      assert User.following?(user, followed)
+      assert Pleroma.FollowingRelationship.get(user, followed)
+
+      {:ok, _, _} = SideEffects.handle(reject)
+
+      refute User.following?(user, followed)
+      refute Pleroma.FollowingRelationship.get(user, followed)
+
+      assert Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(user, followed).data["state"] ==
+               "reject"
+
+      assert User.get_follow_state(user, followed) == nil
+      assert User.get_follow_state(user, followed, nil) == nil
+    end
+  end
 end