diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-04 17:39:20 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 17:39:20 +0000 |
| commit | 222c238e7b807853dc02a79e00273b5f6b70eb4b (patch) | |
| tree | 81942e71bc994ecb892c7dd36766b4f65e60954a /lib | |
| parent | a553ed542774891b6b0b7a57372a2c0300bbe2ba (diff) | |
| parent | 6b7cd7d8504d47eef4efdf34fbd1d0eb32bb8375 (diff) | |
| download | pleroma-222c238e7b807853dc02a79e00273b5f6b70eb4b.tar.gz | |
Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
Backport !1777 to 1.1
See merge request pleroma/pleroma!1786
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 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]) -> |