diff options
author | lain <lain@soykaf.club> | 2020-08-18 12:38:13 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-18 12:38:13 +0200 |
commit | 548ca43bcf9ed72a70bd98f074241dbb0e7801ec (patch) | |
tree | e32fafa13056d489c27a0b7a4afab6ca641b14ba /lib/pleroma/user.ex | |
parent | 7a273087ed7b49dedd821ca69a6e09d5f893c913 (diff) | |
parent | 34b099fffa64c20d42c417abb06e0e32a5ad296a (diff) | |
download | pleroma-548ca43bcf9ed72a70bd98f074241dbb0e7801ec.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index d1436a688..ac065e9dc 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -311,10 +311,12 @@ defmodule Pleroma.User do def visible_for(_, _), do: :invisible - defp restrict_unauthenticated?(%User{local: local}) do - config_key = if local, do: :local, else: :remote + defp restrict_unauthenticated?(%User{local: true}) do + Config.restrict_unauthenticated_access?(:profiles, :local) + end - Config.get([:restrict_unauthenticated, :profiles, config_key], false) + defp restrict_unauthenticated?(%User{local: _}) do + Config.restrict_unauthenticated_access?(:profiles, :remote) end defp visible_account_status(user) do |