X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=01cbfe796379d864b997796a3879e731095ed4c9;hb=102455bf296165a88578a04f0ded259c32349d7f;hp=c264d7e90994560824d88c7557fc43d7bbbe3eef;hpb=bed0b398139897ebe9f839d1263acf6934c4a42f;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index c264d7e90..01cbfe796 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -121,7 +121,7 @@ defmodule Pleroma.User do
 
   def get_cached_by_nickname(nickname) do
     key = "nickname:#{nickname}"
-    Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, nickname: nickname) end)
+    Cachex.get!(:user_cache, key, fallback: fn(_) -> get_or_fetch_by_nickname(nickname) end)
   end
 
   def get_by_nickname(nickname) do
@@ -137,7 +137,8 @@ defmodule Pleroma.User do
     with %User{} = user <- get_by_nickname(nickname)  do
       user
     else _e ->
-      with {:ok, user} <- OStatus.make_user(nickname) do
+      with [nick, domain] <- String.split(nickname, "@"),
+           {:ok, user} <- OStatus.make_user(nickname) do
         user
       else _e -> nil
       end