user: remove entirely redundant remote_or_auth_active?/1.

auth_active?/1 can check remote users and return true directly.

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5491e8b9a499bf8e32dbb217a94b0ad732945689..636c56312e970b2a8c94a7a6eca963daf085178d 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -44,6 +44,8 @@ defmodule Pleroma.User do
     timestamps()
   end
 
+  def auth_active?(%User{local: false}), do: false
+
   def auth_active?(%User{info: %User.Info{confirmation_pending: false}}), do: true
 
   def auth_active?(%User{info: %User.Info{confirmation_pending: true}}),
@@ -51,15 +53,12 @@ defmodule Pleroma.User do
 
   def auth_active?(_), do: false
 
-  def remote_or_auth_active?(%User{local: false}), do: true
-  def remote_or_auth_active?(%User{local: true} = user), do: auth_active?(user)
-
   def visible_for?(user, for_user \\ nil)
 
   def visible_for?(%User{id: user_id}, %User{id: for_id}) when user_id == for_id, do: true
 
   def visible_for?(%User{} = user, for_user) do
-    remote_or_auth_active?(user) || superuser?(for_user)
+    auth_active?(user) || superuser?(for_user)
   end
 
   def visible_for?(_, _), do: false

diff --git a/test/user_test.exs b/test/user_test.exs
index 419a576dc3bce04ff28e8f06086f891d4dc2e0d9..1c4e84914d34091a90c4c65fbd6874cf54a46311 100644 (file)
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -768,16 +768,16 @@ defmodule Pleroma.UserTest do
     end
   end
 
-  test "remote_or_auth_active?/1 works correctly" do
+  test "auth_active?/1 works correctly" do
     Pleroma.Config.put([:instance, :account_activation_required], true)
 
     local_user = insert(:user, local: true, info: %{confirmation_pending: true})
     confirmed_user = insert(:user, local: true, info: %{confirmation_pending: false})
     remote_user = insert(:user, local: false)
 
-    refute User.remote_or_auth_active?(local_user)
-    assert User.remote_or_auth_active?(confirmed_user)
-    assert User.remote_or_auth_active?(remote_user)
+    refute User.auth_active?(local_user)
+    assert User.auth_active?(confirmed_user)
+    assert User.auth_active?(remote_user)
 
     Pleroma.Config.put([:instance, :account_activation_required], false)
   end