logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 1625021a9cd01127171709324f165899a52acfe5
parent: 9b35a4e850ca9fe1d36b9157054bcde3b4e41083
Author: eal <eal@waifu.club>
Date:   Tue, 21 Nov 2017 23:09:59 +0000

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

Dont include the user in their own follower count.

See merge request pleroma/pleroma!29

Diffstat:

Mlib/pleroma/user.ex1+
Mtest/user_test.exs1+
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git 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 @@ -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