a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

obligatory format commit

This commit is contained in:
Sadposter 2019-11-28 10:40:50 +00:00
parent fa97eddf8a
commit c7cc80a9ee
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/user.ex
View File

@ -1020,7 +1020,8 @@ defmodule Pleroma.User do
do: Enum.member?(user.muted_notifications, ap_id) do: Enum.member?(user.muted_notifications, ap_id)
def blocks?(%User{} = user, %User{} = target) do def blocks?(%User{} = user, %User{} = target) do
blocks_ap_id?(user, target) || (!User.following?(user, target) && blocks_domain?(user, target)) blocks_ap_id?(user, target) ||
(!User.following?(user, target) && blocks_domain?(user, target))
end end
def blocks?(nil, _), do: false def blocks?(nil, _), do: false

12
test/user_test.exs
View File

@ -881,13 +881,13 @@ defmodule Pleroma.UserTest do
end end
test "follows take precedence over domain blocks" do test "follows take precedence over domain blocks" do
user = insert(:user) user = insert(:user)
good_eggo = insert(:user, %{ap_id: "https://meanies.social/user/cuteposter"}) good_eggo = insert(:user, %{ap_id: "https://meanies.social/user/cuteposter"})
{:ok, user} = User.block_domain(user, "meanies.social")
{:ok, user} = User.follow(user, good_eggo)
refute User.blocks?(user, good_eggo) {:ok, user} = User.block_domain(user, "meanies.social")
{:ok, user} = User.follow(user, good_eggo)
refute User.blocks?(user, good_eggo)
end end
end end