diff options
| author | lain <lain@soykaf.club> | 2019-10-04 11:54:05 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-04 11:54:05 +0000 |
| commit | 27e914955ebf150a08bcda04545f7df591dae151 (patch) | |
| tree | f5b39e8ac049c95bb2a289348271bb9e0d7283b7 /lib | |
| parent | 01da6344b96d74bcb3db5cc73007bf32949f91ca (diff) | |
| parent | 821729208506980bc65e9671c5462b629dffddaa (diff) | |
| download | pleroma-27e914955ebf150a08bcda04545f7df591dae151.tar.gz | |
Merge branch 'fix/nickname-fail' into 'develop'
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
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]) -> |