diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-04 01:05:50 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-04 14:44:09 +0300 |
| commit | 821729208506980bc65e9671c5462b629dffddaa (patch) | |
| tree | ef5eb4a1439f71eaa050e093e590ad889d44f308 /lib | |
| parent | 4fe2af3b2d6b0701de2ae88f9932e4b6039ced11 (diff) | |
| download | pleroma-821729208506980bc65e9671c5462b629dffddaa.tar.gz | |
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 4c1cdd042..c2f8fa0d7 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -583,7 +583,7 @@ defmodule Pleroma.User do is_integer(nickname_or_id) or FlakeId.flake_id?(nickname_or_id) -> get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) - restrict_to_local == false -> + restrict_to_local == false or not String.contains?(nickname_or_id, "@") -> get_cached_by_nickname(nickname_or_id) restrict_to_local == :unauthenticated and match?(%User{}, opts[:for]) -> |