Browse Source

obligatory format commit

remote-follow-auth-fix
Sadposter 4 years ago
parent
commit
c7cc80a9ee
2 changed files with 8 additions and 7 deletions
  1. +2
    -1
      lib/pleroma/user.ex
  2. +6
    -6
      test/user_test.exs

+ 2
- 1
lib/pleroma/user.ex View File

@@ -1020,7 +1020,8 @@ defmodule Pleroma.User do
do: Enum.member?(user.muted_notifications, ap_id)

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

def blocks?(nil, _), do: false


+ 6
- 6
test/user_test.exs View File

@@ -881,13 +881,13 @@ defmodule Pleroma.UserTest do
end

test "follows take precedence over domain blocks" do
user = insert(:user)
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)
user = insert(:user)
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)
refute User.blocks?(user, good_eggo)
end
end



Loading…
Cancel
Save