diff options
| author | Francis Dinh <normandy@firemail.cc> | 2018-04-20 16:47:44 -0400 |
|---|---|---|
| committer | Francis Dinh <normandy@firemail.cc> | 2018-04-20 16:48:18 -0400 |
| commit | c5dc7e6e3166674744b33f0a098622f263edb605 (patch) | |
| tree | 9059aa5684e377c16f71da2e0f581e355809a1a5 /lib/pleroma/user.ex | |
| parent | 32a26eb91048bb92abfd3c7770dc0d72855101c3 (diff) | |
| parent | a61e8ac15473aca6d0ec9ef20df981bcef9d5897 (diff) | |
| download | pleroma-c5dc7e6e3166674744b33f0a098622f263edb605.tar.gz | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index e959fe677..c77fd6816 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -250,6 +250,13 @@ defmodule Pleroma.User do Repo.get_by(User, nickname: nickname) end + def get_by_nickname_or_email(nickname_or_email) do + case user = Repo.get_by(User, nickname: nickname_or_email) do + %User{} -> user + nil -> Repo.get_by(User, email: nickname_or_email) + end + end + def get_cached_user_info(user) do key = "user_info:#{user.id}" Cachex.get!(:user_cache, key, fallback: fn _ -> user_info(user) end) |