Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...

[akkoma] / test / web / mastodon_api / views / account_view_test.exs

diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs
index 62b2ab7e36eb74a06de9df3bdd6416416ff392e7..f8b74553b7c71e26ca089ad9e9579040cfa16e63 100644 (file)
--- a/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@@ -26,12 +26,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
 
     user =
       insert(:user, %{
 
     user =
       insert(:user, %{

-        info: %{
-          note_count: 5,
-          follower_count: 3,
-          source_data: source_data,
-          background: background_image
-        },
+        follower_count: 3,
+        note_count: 5,
+        source_data: source_data,
+        background: background_image,

         nickname: "shp@shitposter.club",
         name: ":karjalanpiirakka: shp",
         bio: "<script src=\"invalid-html\"></script><span>valid html</span>",
         nickname: "shp@shitposter.club",
         name: ":karjalanpiirakka: shp",
         bio: "<script src=\"invalid-html\"></script><span>valid html</span>",


@@ -101,7 +99,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       "non_followers" => true
     }
 
       "non_followers" => true
     }
 

-    privacy = user.info.default_scope
+    privacy = user.default_scope

 
     assert %{
              pleroma: %{notification_settings: ^notification_settings},
 
     assert %{
              pleroma: %{notification_settings: ^notification_settings},


@@ -112,7 +110,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   test "Represent a Service(bot) account" do
     user =
       insert(:user, %{
   test "Represent a Service(bot) account" do
     user =
       insert(:user, %{

-        info: %{note_count: 5, follower_count: 3, source_data: %{"type" => "Service"}},
+        follower_count: 3,
+        note_count: 5,
+        source_data: %{"type" => "Service"},

         nickname: "shp@shitposter.club",
         inserted_at: ~N[2017-08-15 15:47:06.597036]
       })
         nickname: "shp@shitposter.club",
         inserted_at: ~N[2017-08-15 15:47:06.597036]
       })


@@ -164,8 +164,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   end
 
   test "Represent a deactivated user for an admin" do
   end
 
   test "Represent a deactivated user for an admin" do

-    admin = insert(:user, %{info: %{is_admin: true}})
-    deactivated_user = insert(:user, %{info: %{deactivated: true}})
+    admin = insert(:user, is_admin: true)
+    deactivated_user = insert(:user, deactivated: true)

     represented = AccountView.render("show.json", %{user: deactivated_user, for: admin})
     assert represented[:pleroma][:deactivated] == true
   end
     represented = AccountView.render("show.json", %{user: deactivated_user, for: admin})
     assert represented[:pleroma][:deactivated] == true
   end


@@ -191,9 +191,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
       {:ok, user} = User.follow(user, other_user)
       {:ok, other_user} = User.follow(other_user, user)
       {:ok, other_user} = User.subscribe(user, other_user)
       {:ok, user} = User.follow(user, other_user)
       {:ok, other_user} = User.follow(other_user, user)
       {:ok, other_user} = User.subscribe(user, other_user)

-      {:ok, user} = User.mute(user, other_user, true)
+      {:ok, _user_mute} = User.mute(user, other_user, true)

       {:ok, user} = CommonAPI.hide_reblogs(user, other_user)
 
       {:ok, user} = CommonAPI.hide_reblogs(user, other_user)
 

+      # Refreshing to reflect embedded ap id relation fields (remove once removed)
+      user = refresh_record(user)
+

       expected = %{
         id: to_string(other_user.id),
         following: true,
       expected = %{
         id: to_string(other_user.id),
         following: true,


@@ -219,8 +222,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
 
       {:ok, user} = User.follow(user, other_user)
       {:ok, other_user} = User.subscribe(user, other_user)
 
       {:ok, user} = User.follow(user, other_user)
       {:ok, other_user} = User.subscribe(user, other_user)

-      {:ok, user} = User.block(user, other_user)
-      {:ok, other_user} = User.block(other_user, user)
+      {:ok, _user_block} = User.block(user, other_user)
+      {:ok, _user_block} = User.block(other_user, user)

 
       expected = %{
         id: to_string(other_user.id),
 
       expected = %{
         id: to_string(other_user.id),


@@ -253,7 +256,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
 
     test "represent a relationship for the user with a pending follow request" do
       user = insert(:user)
 
     test "represent a relationship for the user with a pending follow request" do
       user = insert(:user)

-      other_user = insert(:user, %{info: %User.Info{locked: true}})
+      other_user = insert(:user, locked: true)

 
       {:ok, user, other_user, _} = CommonAPI.follow(user, other_user)
       user = User.get_cached_by_id(user.id)
 
       {:ok, user, other_user, _} = CommonAPI.follow(user, other_user)
       user = User.get_cached_by_id(user.id)


@@ -282,14 +285,16 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   test "represent an embedded relationship" do
     user =
       insert(:user, %{
   test "represent an embedded relationship" do
     user =
       insert(:user, %{

-        info: %{note_count: 5, follower_count: 0, source_data: %{"type" => "Service"}},
+        follower_count: 0,
+        note_count: 5,
+        source_data: %{"type" => "Service"},

         nickname: "shp@shitposter.club",
         inserted_at: ~N[2017-08-15 15:47:06.597036]
       })
 
     other_user = insert(:user)
     {:ok, other_user} = User.follow(other_user, user)
         nickname: "shp@shitposter.club",
         inserted_at: ~N[2017-08-15 15:47:06.597036]
       })
 
     other_user = insert(:user)
     {:ok, other_user} = User.follow(other_user, user)

-    {:ok, other_user} = User.block(other_user, user)
+    {:ok, _user_block} = User.block(other_user, user)

     {:ok, _} = User.follow(insert(:user), user)
 
     expected = %{
     {:ok, _} = User.follow(insert(:user), user)
 
     expected = %{


@@ -352,7 +357,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
   end
 
   test "returns the settings store if the requesting user is the represented user and it's requested specifically" do
   end
 
   test "returns the settings store if the requesting user is the represented user and it's requested specifically" do

-    user = insert(:user, %{info: %User.Info{pleroma_settings_store: %{fe: "test"}}})
+    user = insert(:user, pleroma_settings_store: %{fe: "test"})

 
     result =
       AccountView.render("show.json", %{user: user, for: user, with_pleroma_settings: true})
 
     result =
       AccountView.render("show.json", %{user: user, for: user, with_pleroma_settings: true})


@@ -374,14 +379,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
 
   describe "hiding follows/following" do
     test "shows when follows/followers stats are hidden and sets follow/follower count to 0" do
 
   describe "hiding follows/following" do
     test "shows when follows/followers stats are hidden and sets follow/follower count to 0" do

-      info = %{
-        hide_followers: true,
-        hide_followers_count: true,
-        hide_follows: true,
-        hide_follows_count: true
-      }
-
-      user = insert(:user, info: info)
+      user =
+        insert(:user, %{
+          hide_followers: true,
+          hide_followers_count: true,
+          hide_follows: true,
+          hide_follows_count: true
+        })

 
       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
 
       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)


@@ -395,7 +399,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "shows when follows/followers are hidden" do
     end
 
     test "shows when follows/followers are hidden" do

-      user = insert(:user, info: %{hide_followers: true, hide_follows: true})
+      user = insert(:user, hide_followers: true, hide_follows: true)

       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)


@@ -408,7 +412,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "shows actual follower/following count to the account owner" do
     end
 
     test "shows actual follower/following count to the account owner" do

-      user = insert(:user, info: %{hide_followers: true, hide_follows: true})
+      user = insert(:user, hide_followers: true, hide_follows: true)

       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
       other_user = insert(:user)
       {:ok, user, other_user, _activity} = CommonAPI.follow(user, other_user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)


@@ -418,6 +422,27 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
                following_count: 1
              } = AccountView.render("show.json", %{user: user, for: user})
     end
                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(other_user, %{
+          "status" => "Hey @#{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
   end
 
   describe "follow requests counter" do


@@ -435,7 +460,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "shows non-zero when follow requests are pending" do
     end
 
     test "shows non-zero when follow requests are pending" do

-      user = insert(:user, %{info: %{locked: true}})
+      user = insert(:user, locked: true)

 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 


@@ -447,7 +472,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "decreases when accepting a follow request" do
     end
 
     test "decreases when accepting a follow request" do

-      user = insert(:user, %{info: %{locked: true}})
+      user = insert(:user, locked: true)

 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 


@@ -464,7 +489,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "decreases when rejecting a follow request" do
     end
 
     test "decreases when rejecting a follow request" do

-      user = insert(:user, %{info: %{locked: true}})
+      user = insert(:user, locked: true)

 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 


@@ -481,14 +506,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     end
 
     test "shows non-zero when historical unapproved requests are present" do
     end
 
     test "shows non-zero when historical unapproved requests are present" do

-      user = insert(:user, %{info: %{locked: true}})
+      user = insert(:user, locked: true)

 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
 
 
       assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
 
       other_user = insert(:user)
       {:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
 

-      {:ok, user} = User.update_info(user, &User.Info.user_upgrade(&1, %{locked: false}))
+      {:ok, user} = User.update_and_set_cache(user, %{locked: false})

 
       assert %{locked: false, follow_requests_count: 1} =
                AccountView.render("show.json", %{user: user, for: user})
 
       assert %{locked: false, follow_requests_count: 1} =
                AccountView.render("show.json", %{user: user, for: user})