From 7a88b726bf81e1610ade2b07ffd6af672b701600 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 16 Sep 2020 17:29:16 +0200
Subject: [PATCH] User: Remote users don't need to be confirmed or approved
---
lib/pleroma/user.ex | 4 ++--
test/user_test.exs | 15 ++++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 57497eb83..1ffe60dfc 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -275,9 +275,9 @@ defmodule Pleroma.User do
@spec account_status(User.t()) :: account_status()
def account_status(%User{deactivated: true}), do: :deactivated
def account_status(%User{password_reset_pending: true}), do: :password_reset_pending
- def account_status(%User{approval_pending: true}), do: :approval_pending
+ def account_status(%User{local: true, approval_pending: true}), do: :approval_pending
- def account_status(%User{confirmation_pending: true}) do
+ def account_status(%User{local: true, confirmation_pending: true}) do
if Config.get([:instance, :account_activation_required]) do
:confirmation_pending
else
diff --git a/test/user_test.exs b/test/user_test.exs
index a910226b2..060918d71 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -1676,7 +1676,7 @@ defmodule Pleroma.UserTest do
assert User.visible_for(user, user) == :visible
end
- test "returns false when the account is unauthenticated and auth is required" do
+ test "returns false when the account is unconfirmed and confirmation is required" do
Pleroma.Config.put([:instance, :account_activation_required], true)
user = insert(:user, local: true, confirmation_pending: true)
@@ -1685,14 +1685,23 @@ defmodule Pleroma.UserTest do
refute User.visible_for(user, other_user) == :visible
end
- test "returns true when the account is unauthenticated and auth is not required" do
+ test "returns true when the account is unconfirmed and confirmation is required but the account is remote" do
+ Pleroma.Config.put([:instance, :account_activation_required], true)
+
+ user = insert(:user, local: false, confirmation_pending: true)
+ other_user = insert(:user, local: true)
+
+ assert User.visible_for(user, other_user) == :visible
+ end
+
+ test "returns true when the account is unconfirmed and confirmation is not required" do
user = insert(:user, local: true, confirmation_pending: true)
other_user = insert(:user, local: true)
assert User.visible_for(user, other_user) == :visible
end
- test "returns true when the account is unauthenticated and being viewed by a privileged account (auth required)" do
+ test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
Pleroma.Config.put([:instance, :account_activation_required], true)
user = insert(:user, local: true, confirmation_pending: true)