Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

This reverts merge request !1737

test/conversation/participation_test.exs

@@ -6,7 +6,6 @@ defmodule Pleroma.Conversation.ParticipationTest do
   use Pleroma.DataCase
   import Pleroma.Factory
   alias Pleroma.Conversation.Participation
-  alias Pleroma.User
   alias Pleroma.Web.CommonAPI
 
   test "getting a participation will also preload things" do
@@ -31,8 +30,6 @@ defmodule Pleroma.Conversation.ParticipationTest do
     {:ok, activity} =
       CommonAPI.post(user, %{"status" => "Hey @#{other_user.nickname}.", "visibility" => "direct"})
 
-    user = User.get_cached_by_id(user.id)
-    other_user = User.get_cached_by_id(user.id)
     [participation] = Participation.for_user(user)
     participation = Pleroma.Repo.preload(participation, :recipients)
 
@@ -158,7 +155,6 @@ defmodule Pleroma.Conversation.ParticipationTest do
     [participation] = Participation.for_user_with_last_activity_id(user)
 
     participation = Repo.preload(participation, :recipients)
-    user = User.get_cached_by_id(user.id)
 
     assert participation.recipients |> length() == 1
     assert user in participation.recipients

test/web/mastodon_api/controllers/conversation_controller_test.exs

@@ -10,23 +10,19 @@ defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
 
   import Pleroma.Factory
 
-  test "returns a list of conversations", %{conn: conn} do
+  test "Conversations", %{conn: conn} do
     user_one = insert(:user)
     user_two = insert(:user)
     user_three = insert(:user)
 
     {:ok, user_two} = User.follow(user_two, user_one)
 
-    assert User.get_cached_by_id(user_two.id).info.unread_conversation_count == 0
-
     {:ok, direct} =
       CommonAPI.post(user_one, %{
         "status" => "Hi @#{user_two.nickname}, @#{user_three.nickname}!",
         "visibility" => "direct"
       })
 
-    assert User.get_cached_by_id(user_two.id).info.unread_conversation_count == 1
-
     {:ok, _follower_only} =
       CommonAPI.post(user_one, %{
         "status" => "Hi @#{user_two.nickname}!",
@@ -56,100 +52,23 @@ defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
     assert is_binary(res_id)
     assert unread == true
     assert res_last_status["id"] == direct.id
-    assert User.get_cached_by_id(user_one.id).info.unread_conversation_count == 1
-  end
-
-  test "updates the last_status on reply", %{conn: conn} do
-    user_one = insert(:user)
-    user_two = insert(:user)
-
-    {:ok, direct} =
-      CommonAPI.post(user_one, %{
-        "status" => "Hi @#{user_two.nickname}",
-        "visibility" => "direct"
-      })
-
-    {:ok, direct_reply} =
-      CommonAPI.post(user_two, %{
-        "status" => "reply",
-        "visibility" => "direct",
-        "in_reply_to_status_id" => direct.id
-      })
-
-    [%{"last_status" => res_last_status}] =
-      conn
-      |> assign(:user, user_one)
-      |> get("/api/v1/conversations")
-      |> json_response(200)
-
-    assert res_last_status["id"] == direct_reply.id
-  end
-
-  test "the user marks a conversation as read", %{conn: conn} do
-    user_one = insert(:user)
-    user_two = insert(:user)
-
-    {:ok, direct} =
-      CommonAPI.post(user_one, %{
-        "status" => "Hi @#{user_two.nickname}",
-        "visibility" => "direct"
-      })
-
-    [%{"id" => direct_conversation_id, "unread" => true}] =
-      conn
-      |> assign(:user, user_one)
-      |> get("/api/v1/conversations")
-      |> json_response(200)
-
-    %{"unread" => false} =
-      conn
-      |> assign(:user, user_one)
-      |> post("/api/v1/conversations/#{direct_conversation_id}/read")
-      |> json_response(200)
-
-    assert User.get_cached_by_id(user_one.id).info.unread_conversation_count == 0
-
-    # The conversation is marked as unread on reply
-    {:ok, _} =
-      CommonAPI.post(user_two, %{
-        "status" => "reply",
-        "visibility" => "direct",
-        "in_reply_to_status_id" => direct.id
-      })
-
-    [%{"unread" => true}] =
-      conn
-      |> assign(:user, user_one)
-      |> get("/api/v1/conversations")
-      |> json_response(200)
-
-    assert User.get_cached_by_id(user_one.id).info.unread_conversation_count == 1
-
-    # A reply doesn't increment the user's unread_conversation_count if the conversation is unread
-    {:ok, _} =
-      CommonAPI.post(user_two, %{
-        "status" => "reply",
-        "visibility" => "direct",
-        "in_reply_to_status_id" => direct.id
-      })
-
-    assert User.get_cached_by_id(user_one.id).info.unread_conversation_count == 1
-  end
-
-  test "(vanilla) Mastodon frontend behaviour", %{conn: conn} do
-    user_one = insert(:user)
-    user_two = insert(:user)
-
-    {:ok, direct} =
-      CommonAPI.post(user_one, %{
-        "status" => "Hi @#{user_two.nickname}!",
-        "visibility" => "direct"
-      })
 
+    # Apparently undocumented API endpoint
     res_conn =
       conn
       |> assign(:user, user_one)
-      |> get("/api/v1/statuses/#{direct.id}/context")
+      |> post("/api/v1/conversations/#{res_id}/read")
+
+    assert response = json_response(res_conn, 200)
+    assert length(response["accounts"]) == 2
+    assert response["last_status"]["id"] == direct.id
+    assert response["unread"] == false
+
+    # (vanilla) Mastodon frontend behaviour
+    res_conn =
+      conn
+      |> assign(:user, user_one)
+      |> get("/api/v1/statuses/#{res_last_status["id"]}/context")
 
     assert %{"ancestors" => [], "descendants" => []} == json_response(res_conn, 200)
   end

test/web/mastodon_api/views/account_view_test.exs

@@ -418,27 +418,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
                following_count: 1
              } = AccountView.render("show.json", %{user: user, for: user})
     end
-
-    test "shows unread_conversation_count only to the account owner" do
-      user = insert(:user)
-      other_user = insert(:user)
-
-      {:ok, _activity} =
-        CommonAPI.post(user, %{
-          "status" => "Hey @#{other_user.nickname}.",
-          "visibility" => "direct"
-        })
-
-      user = User.get_cached_by_ap_id(user.ap_id)
-
-      assert AccountView.render("show.json", %{user: user, for: other_user})[:pleroma][
-               :unread_conversation_count
-             ] == nil
-
-      assert AccountView.render("show.json", %{user: user, for: user})[:pleroma][
-               :unread_conversation_count
-             ] == 1
-    end
   end
 
   describe "follow requests counter" do

test/web/pleroma_api/controllers/pleroma_api_controller_test.exs

@@ -8,7 +8,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
   alias Pleroma.Conversation.Participation
   alias Pleroma.Notification
   alias Pleroma.Repo
-  alias Pleroma.User
   alias Pleroma.Web.CommonAPI
 
   import Pleroma.Factory
@@ -74,7 +73,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
 
     participation = Repo.preload(participation, :recipients)
 
-    user = User.get_cached_by_id(user.id)
     assert [user] == participation.recipients
     assert other_user not in participation.recipients