Save follower count and note count in user.

5 files changed, 47 insertions, 5 deletions

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 1356ebde9..eca73725d 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Factory do
       email: sequence(:email, &"user#{&1}@example.com"),
       nickname: sequence(:nickname, &"nick#{&1}"),
       password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
-      bio: sequence(:bio, &"Tester Number #{&1}"),
+      bio: sequence(:bio, &"Tester Number #{&1}")
     }
     %{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user) }
   end
diff --git a/test/user_test.exs b/test/user_test.exs
index 81827afa3..097d7d98e 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -37,6 +37,9 @@ defmodule Pleroma.UserTest do
 
     user = Repo.get(User, user.id)
 
+    followed = User.get_by_ap_id(followed.ap_id)
+    assert followed.info["follower_count"] == 1
+
     assert user.following == [User.ap_followers(followed)]
   end
 
@@ -224,8 +227,37 @@ defmodule Pleroma.UserTest do
 
       {:ok, res} = User.get_friends(user)
 
+      followed_one = User.get_by_ap_id(followed_one.ap_id)
+      followed_two = User.get_by_ap_id(followed_two.ap_id)
       assert res == [followed_one, followed_two]
     end
   end
+
+  describe "updating note and follower count" do
+    test "it sets the info->note_count property" do
+      note = insert(:note)
+
+      user = User.get_by_ap_id(note.data["actor"])
+
+      assert user.info["note_count"] == nil
+
+      {:ok, user} = User.update_note_count(user)
+
+      assert user.info["note_count"] == 1
+    end
+
+    test "it sets the info->follower_count property" do
+      user = insert(:user)
+      follower = insert(:user)
+
+      User.follow(follower, user)
+
+      assert user.info["follower_count"] == nil
+
+      {:ok, user} = User.update_follower_count(user)
+
+      assert user.info["follower_count"] == 1
+    end
+  end
 end
 
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 34bfaa005..959b744af 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -15,6 +15,8 @@ defmodule Pleroma.Web.OStatusTest do
     incoming = File.read!("test/fixtures/incoming_note_activity.xml")
     {:ok, [activity]} = OStatus.handle_incoming(incoming)
 
+    user = User.get_by_ap_id(activity.data["actor"])
+    assert user.info["note_count"] == 1
     assert activity.data["type"] == "Create"
     assert activity.data["object"]["type"] == "Note"
     assert activity.data["object"]["id"] == "tag:gs.example.org:4040,2017-04-23:noticeId=29:objectType=note"
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 48d48eb2b..bbb261eff 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -9,8 +9,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
   import Pleroma.Factory
 
   test "create a status" do
-    # user = UserBuilder.build(%{ap_id: "142344"})
-    user = insert(:user, %{ap_id: "142344"})
+    user = insert(:user)
     _mentioned_user = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
 
     object_data = %{
@@ -53,10 +52,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert is_list(activity.data["object"]["attachment"])
 
     assert activity.data["object"] == Object.get_by_ap_id(activity.data["object"]["id"]).data
+
+    user = User.get_by_ap_id(user.ap_id)
+
+    assert user.info["note_count"] == 1
   end
 
   test "create a status that is a reply" do
-    user = UserBuilder.build(%{ap_id: "some_cool_id"})
+    user = insert(:user)
     input = %{
       "status" => "Hello again."
     }
@@ -74,7 +77,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert get_in(reply.data, ["object", "context"]) == get_in(activity.data, ["object", "context"])
     assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
     assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
-    assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")
+    assert Enum.member?(get_in(reply.data, ["to"]), user.ap_id)
   end
 
   test "fetch public statuses, excluding remote ones." do
@@ -188,6 +191,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
     assert user.following == [User.ap_followers(followed)]
 
+    followed = User.get_by_ap_id(followed.ap_id)
+    assert followed.info["follower_count"] == 1
+
     { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
     assert msg == "Could not follow user: #{followed.nickname} is already on your list."
   end
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index de2cd3d30..b81d3d64d 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -22,6 +22,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
   test "A user" do
     note_activity = insert(:note_activity)
     user = User.get_cached_by_ap_id(note_activity.data["actor"])
+    {:ok, user} = User.update_note_count(user)
     follower = insert(:user)
     second_follower = insert(:user)
 
@@ -57,6 +58,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
 
   test "A user for a given other follower", %{user: user} do
     {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
+    {:ok, user} = User.update_follower_count(user)
     image = "https://placehold.it/48x48"
     represented = %{
       "id" => user.id,