Federate out content warnings.

[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 a2c2a4b4ca3f8b45bf67cef9884b404a1b4e4eb2..4e3fbb4f692f8be010ed7150c69102f406d26b4b 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -8,13 +8,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   import Ecto.Query
 
   def feed_redirect(conn, %{"nickname" => nickname}) do
-    with %User{} = user <- User.get_cached_by_nickname(nickname) do
-      case get_format(conn) do
-        "html" -> Fallback.RedirectController.redirector(conn, nil)
-        _ -> redirect conn, external: OStatus.feed_path(user)
-      end
-    else
-      _e -> send_resp(conn, 404, "No user found")
+    user = User.get_cached_by_nickname(nickname)
+
+    case get_format(conn) do
+      "html" -> Fallback.RedirectController.redirector(conn, nil)
+      _ -> redirect conn, external: OStatus.feed_path(user)
     end
   end
 
@@ -23,7 +21,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     query = from activity in Activity,
       where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
       limit: 20,
-      order_by: [desc: :inserted_at]
+      order_by: [desc: :id]
 
     activities = query
     |> Repo.all