X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fconversation_test.exs;h=f3300e7d18a535db0deb78df160197369821ab0d;hb=81d1aa424d65b364ec8f2aee45247e7d95e3f255;hp=1c9d485ff5c063e302266ce57d5dae05fe4ad41b;hpb=280172f6f6d74872349e3b4e6f1feaa9c95b3900;p=akkoma

diff --git a/test/conversation_test.exs b/test/conversation_test.exs
index 1c9d485ff..f3300e7d1 100644
--- a/test/conversation_test.exs
+++ b/test/conversation_test.exs
@@ -22,7 +22,8 @@ defmodule Pleroma.ConversationTest do
     user = insert(:user)
     {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey"})
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation = Conversation.get_for_ap_id(context)
 
@@ -31,23 +32,26 @@ defmodule Pleroma.ConversationTest do
 
   test "it creates or updates a conversation and participations for a given DM" do
     har = insert(:user)
-    jafnhar = insert(:user)
+    jafnhar = insert(:user, local: false)
     tridi = insert(:user)
 
     {:ok, activity} =
       CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "direct"})
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation =
       Conversation.get_for_ap_id(context)
       |> Repo.preload(:participations)
 
     assert conversation
-    [har_participation, jafnhar_participation] = conversation.participations
 
-    assert har_participation.user_id == har.id
-    assert jafnhar_participation.user_id == jafnhar.id
+    assert Enum.find(conversation.participations, fn %{user_id: user_id} -> har.id == user_id end)
+
+    assert Enum.find(conversation.participations, fn %{user_id: user_id} ->
+             jafnhar.id == user_id
+           end)
 
     {:ok, activity} =
       CommonAPI.post(jafnhar, %{
@@ -56,7 +60,8 @@ defmodule Pleroma.ConversationTest do
         "in_reply_to_status_id" => activity.id
       })
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation_two =
       Conversation.get_for_ap_id(context)
@@ -64,10 +69,13 @@ defmodule Pleroma.ConversationTest do
 
     assert conversation_two.id == conversation.id
 
-    [har_participation_two, jafnhar_participation_two] = conversation_two.participations
+    assert Enum.find(conversation_two.participations, fn %{user_id: user_id} ->
+             har.id == user_id
+           end)
 
-    assert har_participation_two.user_id == har.id
-    assert jafnhar_participation_two.user_id == jafnhar.id
+    assert Enum.find(conversation_two.participations, fn %{user_id: user_id} ->
+             jafnhar.id == user_id
+           end)
 
     {:ok, activity} =
       CommonAPI.post(tridi, %{
@@ -76,19 +84,54 @@ defmodule Pleroma.ConversationTest do
         "in_reply_to_status_id" => activity.id
       })
 
-    context = activity.data["object"]["context"]
+    object = Pleroma.Object.normalize(activity)
+    context = object.data["context"]
 
     conversation_three =
       Conversation.get_for_ap_id(context)
-      |> Repo.preload(:participations)
+      |> Repo.preload([:participations, :users])
 
     assert conversation_three.id == conversation.id
 
-    [har_participation_three, jafnhar_participation_three, tridi_participation] =
-      conversation_three.participations
+    assert Enum.find(conversation_three.participations, fn %{user_id: user_id} ->
+             har.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.participations, fn %{user_id: user_id} ->
+             jafnhar.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.participations, fn %{user_id: user_id} ->
+             tridi.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             har.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             jafnhar.id == user_id
+           end)
+
+    assert Enum.find(conversation_three.users, fn %{id: user_id} ->
+             tridi.id == user_id
+           end)
+  end
+
+  test "create_or_bump_for returns the conversation with participations" do
+    har = insert(:user)
+    jafnhar = insert(:user, local: false)
+
+    {:ok, activity} =
+      CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "direct"})
+
+    {:ok, conversation} = Conversation.create_or_bump_for(activity)
+
+    assert length(conversation.participations) == 2
+
+    {:ok, activity} =
+      CommonAPI.post(har, %{"status" => "Hey @#{jafnhar.nickname}", "visibility" => "public"})
 
-    assert har_participation_three.user_id == har.id
-    assert jafnhar_participation_three.user_id == jafnhar.id
-    assert tridi_participation.user_id == tridi.id
+    assert {:error, _} = Conversation.create_or_bump_for(activity)
   end
 end