Add direct_note[_activity]_factory and a couple tests

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 8e21e2562da62cc47ee5b34ccece059cbbed7ea0..47626cb3e5595666aa008b6747dccd361d291ff7 100644 (file)
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -45,6 +45,33 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def direct_note_factory do
+    user2 = insert(:user)
+
+    %Pleroma.Object{data: data} = note_factory()
+    %Pleroma.Object{data: Map.merge(data, %{"to" => [user2.ap_id]})}
+  end
+
+  def direct_note_activity_factory do
+    dm = insert(:direct_note)
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+      "type" => "Create",
+      "actor" => dm.data["actor"],
+      "to" => dm.data["to"],
+      "object" => dm.data,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+      "context" => dm.data["context"]
+    }
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+  end
+
   def note_activity_factory do
     note = insert(:note)
 

diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 71a6eed8d6b96d927d19c8ff706bdee414bf7e1c..94131dcb3f4346ff0a7a2b7fb3a86c2f9bb63eeb 100644 (file)
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -125,19 +125,37 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
   end
 
   test "posting a direct status", %{conn: conn} do
-       user1 = insert(:user)
-       user2 = insert(:user)
-       content = "direct cofe @#{user2.nickname}"
-
-       conn =
-         conn
-       |> assign(:user, user1)
-       |> post("api/v1/statuses", %{"status" => content,
-                                                                "visibility" => "direct"})
-
-       assert %{"content" => content, "id" => id, "visibility" => "direct"} =  json_response(conn, 200)
-       assert activity = Repo.get(Activity, id)
-       assert user2.follower_address not in activity.data["to"]
+    user1 = insert(:user)
+    user2 = insert(:user)
+    content = "direct cofe @#{user2.nickname}"
+
+    conn =
+      conn
+      |> assign(:user, user1)
+      |> post("api/v1/statuses", %{"status" => content, "visibility" => "direct"})
+
+    assert %{"id" => id, "visibility" => "direct"} = json_response(conn, 200)
+    assert activity = Repo.get(Activity, id)
+    assert user2.follower_address not in activity.data["to"]
+  end
+
+  test "direct timeline", %{conn: conn} do
+    dm = insert(:direct_note_activity)
+    reg_note = insert(:note_activity)
+
+    recipient = User.get_by_ap_id(hd(dm.recipients))
+
+    conn =
+      conn
+      |> assign(:user, recipient)
+      |> get("api/v1/timelines/direct")
+
+    resp = json_response(conn, 200)
+    first_status = hd(resp)
+
+    assert length(resp) == 1
+    assert %{"visibility" => "direct"} = first_status
+    assert first_status["url"] != reg_note.data["id"]
   end
 
   test "replying to a status", %{conn: conn} do