summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-04 01:05:50 +0300
committerrinpatch <rinpatch@sdf.org>2019-10-04 20:26:48 +0300
commit6b7cd7d8504d47eef4efdf34fbd1d0eb32bb8375 (patch)
tree81942e71bc994ecb892c7dd36766b4f65e60954a /lib
parenta553ed542774891b6b0b7a57372a2c0300bbe2ba (diff)
downloadpleroma-6b7cd7d8504d47eef4efdf34fbd1d0eb32bb8375.tar.gz
pleroma-6b7cd7d8504d47eef4efdf34fbd1d0eb32bb8375.zip
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.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5e10ac25f..06cffbd60 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -576,7 +576,7 @@ defmodule Pleroma.User do
is_integer(nickname_or_id) or Pleroma.FlakeId.is_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]) ->