diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-02-13 13:04:23 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-02-13 13:04:23 +0000 |
| commit | 99f955cd9e48ba956da438926dd8626fe43aa3a1 (patch) | |
| tree | 3d7bcd46772f90e043cfea7acecf612220d57485 /lib | |
| parent | 33f8f3c33ad8c9e3ee8a5b9ad8c46676ffe96bce (diff) | |
| parent | 88a4de24f9bc6fc73696cb5c986440c2c659b636 (diff) | |
| download | pleroma-99f955cd9e48ba956da438926dd8626fe43aa3a1.tar.gz | |
Merge branch 'mass-follow-fixes' into 'develop'
User.follow_all: Respect blocks in both directions.
See merge request pleroma/pleroma!823
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 0060d966b..3232cb842 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -311,12 +311,12 @@ defmodule Pleroma.User do end end - @doc "A mass follow for local users. Respects blocks but does not create activities." + @doc "A mass follow for local users. Respects blocks in both directions but does not create activities." @spec follow_all(User.t(), list(User.t())) :: {atom(), User.t()} def follow_all(follower, followeds) do followed_addresses = followeds - |> Enum.reject(fn %{ap_id: ap_id} -> ap_id in follower.info.blocks end) + |> Enum.reject(fn followed -> blocks?(follower, followed) || blocks?(followed, follower) end) |> Enum.map(fn %{follower_address: fa} -> fa end) q = |