X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus_controller.ex;h=5dbee20e1c9429f112db4d8b0362ca9e2f31f070;hb=7fb37804313339f9a2215aea27ece42e8ec31312;hp=fbd25c5f53c8d23032b7d9d61a1f7c54807355ed;hpb=018516d3f3fcc6e902a5382517792832841695d3;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index fbd25c5f5..5dbee20e1 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -14,12 +14,12 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   action_fallback(:errors)
 
   def feed_redirect(conn, %{"nickname" => nickname}) do
-    format = get_format(conn)
-    IO.puts(format)
-    case format do
+    case get_format(conn) do
       "html" ->
-        with %User{} = user <- User.get_cached_by_nickname(nickname) do
+        with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
           Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
+        else
+          nil -> {:error, :not_found}
         end
 
       "activity+json" ->