projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
33f8f3c
)
User.follow_all: Respect blocks in both directions.
author
lain
<lain@soykaf.club>
Wed, 13 Feb 2019 12:52:27 +0000
(13:52 +0100)
committer
lain
<lain@soykaf.club>
Wed, 13 Feb 2019 12:52:27 +0000
(13:52 +0100)
lib/pleroma/user.ex
patch
|
blob
|
history
test/user_test.exs
patch
|
blob
|
history
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 0060d966bd17289cdfe7fba93dd88acbc7f192a9..3232cb8421e50f7596c778b1482f0b92c70f2f36 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-311,12
+311,12
@@
defmodule Pleroma.User do
end
end
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
@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 =
|> Enum.map(fn %{follower_address: fa} -> fa end)
q =
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 523ab1ea430256ebb3ac257aac2080262df2a8ba..a282274cebf323c8aafec97c636534d612f73d6e 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-55,18
+55,21
@@
defmodule Pleroma.UserTest do
followed_two = insert(:user)
blocked = insert(:user)
not_followed = insert(:user)
followed_two = insert(:user)
blocked = insert(:user)
not_followed = insert(:user)
+ reverse_blocked = insert(:user)
{:ok, user} = User.block(user, blocked)
{:ok, user} = User.block(user, blocked)
+ {:ok, reverse_blocked} = User.block(reverse_blocked, user)
{:ok, user} = User.follow(user, followed_zero)
{:ok, user} = User.follow(user, followed_zero)
- {:ok, user} = User.follow_all(user, [followed_one, followed_two, blocked])
+ {:ok, user} = User.follow_all(user, [followed_one, followed_two, blocked
, reverse_blocked
])
assert User.following?(user, followed_one)
assert User.following?(user, followed_two)
assert User.following?(user, followed_zero)
refute User.following?(user, not_followed)
refute User.following?(user, blocked)
assert User.following?(user, followed_one)
assert User.following?(user, followed_two)
assert User.following?(user, followed_zero)
refute User.following?(user, not_followed)
refute User.following?(user, blocked)
+ refute User.following?(user, reverse_blocked)
end
test "follow_all follows mutliple users without duplicating" do
end
test "follow_all follows mutliple users without duplicating" do