Merge branch 'fix/following-request-from-deactivated' into 'develop'

Filter outstanding follower requests from deactivated accounts

Closes #1771

See merge request pleroma/pleroma!2682
This commit is contained in:
lain 2020-06-25 06:50:44 +00:00
commit 0e26ef2ab9
2 changed files with 11 additions and 0 deletions

View file

@ -124,6 +124,7 @@ defmodule Pleroma.FollowingRelationship do
|> join(:inner, [r], f in assoc(r, :follower))
|> where([r], r.state == ^:follow_pending)
|> where([r], r.following_id == ^id)
|> where([r, f], f.deactivated != true)
|> select([r, f], f)
|> Repo.all()
end