Merge branch 'develop' into oembed_provider

[akkoma] / lib / pleroma / web / ostatus / ostatus_controller.ex

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 55dbcab9302e56fbdc939da096be0ec1748fe913..5dbee20e1c9429f112db4d8b0362ca9e2f31f070 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -16,8 +16,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   def feed_redirect(conn, %{"nickname" => nickname}) 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" ->