projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
[akkoma]
/
lib
/
pleroma
/
following_relationship.ex
diff --git
a/lib/pleroma/following_relationship.ex
b/lib/pleroma/following_relationship.ex
index 093b1f4050d62a94f70c865bc27262f2cb70b6ca..c2020d30a876a9169682f8271861d9e808165bf2 100644
(file)
--- a/
lib/pleroma/following_relationship.ex
+++ b/
lib/pleroma/following_relationship.ex
@@
-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