moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Dont include the user in their own follower count.

See merge request pleroma/pleroma!29
This commit is contained in:
eal 2017-11-21 23:09:59 +00:00
parent 9b35a4e850 e9037ffc8d
commit 1625021a9c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/user.ex
View File

@ -265,6 +265,7 @@ def update_note_count(%User{} = user) do
def update_follower_count(%User{} = user) do def update_follower_count(%User{} = user) do
follower_count_query = from u in User, follower_count_query = from u in User,
where: fragment("? @> ?", u.following, ^user.follower_address), where: fragment("? @> ?", u.following, ^user.follower_address),
where: u.id != ^user.id,
select: count(u.id) select: count(u.id)
follower_count = Repo.one(follower_count_query) follower_count = Repo.one(follower_count_query)

1
test/user_test.exs
View File

@ -71,6 +71,7 @@ test "unfollow doesn't unfollow yourself" do
{:error, _} = User.unfollow(user, user) {:error, _} = User.unfollow(user, user)
user = Repo.get(User, user.id)
assert user.following == [user.ap_id] assert user.following == [user.ap_id]
end end