squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname

Browse Source 
(<nick>@<our_instance_host>).
This commit is contained in:
Ivan Tashkinov 2018-12-29 12:15:46 +03:00
parent 67b4297f4d
commit b3574dccbb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/user.ex
View File

@ -387,7 +387,11 @@ defmodule Pleroma.User do
end end
def get_by_nickname(nickname) do def get_by_nickname(nickname) do
Repo.get_by(User, nickname: nickname) Repo.get_by(User, nickname: nickname) ||
if String.ends_with?(nickname, "@" <> Pleroma.Web.Endpoint.host()) do
[local_nickname, _] = String.split(nickname, "@")
Repo.get_by(User, nickname: local_nickname)
end
end end
def get_by_nickname_or_email(nickname_or_email) do def get_by_nickname_or_email(nickname_or_email) do