X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fuser.ex;h=5e8dfc669ded609bd871d51e24a86395f0abf4a0;hb=97b35e00b049c8f908484163b5ffdbcb55db7867;hp=6e8103c1c78d72f92ac7720bd0c2cfbf157cd380;hpb=a2e03d4f3cfc7ccae98ae19db253aec8f1d3e9d0;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 6e8103c1c..5e8dfc669 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -492,6 +492,7 @@ defmodule Pleroma.User do
 
   def get_cached_by_nickname(nickname) do
     key = "nickname:#{nickname}"
+
     Cachex.fetch!(:user_cache, key, fn ->
       user_result = get_or_fetch_by_nickname(nickname)
 
@@ -547,7 +548,7 @@ defmodule Pleroma.User do
 
           {:ok, user}
         else
-          _e -> {:error, "Error"}
+          e -> {:error, e}
         end
     end
   end
@@ -1166,9 +1167,7 @@ defmodule Pleroma.User do
     if !is_nil(user) and !User.needs_update?(user) do
       {:ok, user}
     else
-      user = fetch_by_ap_id(ap_id)
-
-      with %User{} = user do
+      with %User{} = user <- fetch_by_ap_id(ap_id) do
         if Pleroma.Config.get([:fetch_initial_posts, :enabled]) do
           {:ok, _} = Task.start(__MODULE__, :fetch_initial_posts, [user])
         end