Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Better error handling for user feeds."

Browse Source 
This reverts commit 11714fbaa2.
This commit is contained in:
Roger Braun 2017-08-03 17:49:18 +02:00
parent 11714fbaa2
commit 27b8e3affb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -8,14 +8,12 @@ defmodule Pleroma.Web.OStatus.OStatusController do
import Ecto.Query import Ecto.Query
def feed_redirect(conn, %{"nickname" => nickname}) do def feed_redirect(conn, %{"nickname" => nickname}) do
with %User{} = user <- User.get_cached_by_nickname(nickname) do user = User.get_cached_by_nickname(nickname)
case get_format(conn) do case get_format(conn) do
"html" -> Fallback.RedirectController.redirector(conn, nil) "html" -> Fallback.RedirectController.redirector(conn, nil)
_ -> redirect conn, external: OStatus.feed_path(user) _ -> redirect conn, external: OStatus.feed_path(user)
end end
else
_e -> send_resp(conn, 404, "No user found")
end
end end
def feed(conn, %{"nickname" => nickname}) do def feed(conn, %{"nickname" => nickname}) do