User.visible_for/2
According to the tests, this was only used for unconfirmed accounts. So this just needed to be restricted to users with privilege :user_activation
This commit is contained in:
parent
bb61cfee8d
commit
edf0013ff3
@ -326,7 +326,7 @@ defmodule Pleroma.User do
|
||||
end
|
||||
|
||||
def visible_for(%User{} = user, for_user) do
|
||||
if superuser?(for_user) do
|
||||
if privileged?(for_user, :user_activation) do
|
||||
:visible
|
||||
else
|
||||
visible_account_status(user)
|
||||
|
@ -1986,13 +1986,18 @@ defmodule Pleroma.UserTest do
|
||||
assert User.visible_for(user, other_user) == :visible
|
||||
end
|
||||
|
||||
test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
|
||||
test "returns true when the account is unconfirmed and being viewed by a privileged account (privilege :user_activation, confirmation required)" do
|
||||
clear_config([:instance, :account_activation_required], true)
|
||||
clear_config([:instance, :admin_privileges], [:user_activation])
|
||||
|
||||
user = insert(:user, local: true, is_confirmed: false)
|
||||
other_user = insert(:user, local: true, is_admin: true)
|
||||
|
||||
assert User.visible_for(user, other_user) == :visible
|
||||
|
||||
clear_config([:instance, :admin_privileges], [])
|
||||
|
||||
refute User.visible_for(user, other_user) == :visible
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user