Merge branch 'fix/self-follow' into 'develop'

Dont include the user in their own follower count.

See merge request pleroma/pleroma!29

2 files changed, 2 insertions, 0 deletions

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f80c0ae33..68ffe184b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -265,6 +265,7 @@ defmodule Pleroma.User do
   def update_follower_count(%User{} = user) do
     follower_count_query = from u in User,
       where: fragment("? @> ?", u.following, ^user.follower_address),
+      where: u.id != ^user.id,
       select: count(u.id)
 
     follower_count = Repo.one(follower_count_query)
diff --git a/test/user_test.exs b/test/user_test.exs
index 8ec23c751..31c5962e2 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -71,6 +71,7 @@ defmodule Pleroma.UserTest do
 
     {:error, _} = User.unfollow(user, user)
 
+    user = Repo.get(User, user.id)
     assert user.following == [user.ap_id]
   end