From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 12 Jun 2017 10:52:40 +0000 (+0200)
Subject: Redirect html user profile request.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a1cabeea4aad2101361b35c47c1bc03e033b4d7c;p=akkoma

Redirect html user profile request.
---

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 948996d01..e676a60c3 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -9,7 +9,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do
 
   def feed_redirect(conn, %{"nickname" => nickname}) do
     user = User.get_cached_by_nickname(nickname)
-    redirect conn, external: OStatus.feed_path(user)
+
+    case get_format(conn) do
+      "html" -> Fallback.RedirectController.redirector(conn, nil)
+      _ -> redirect conn, external: OStatus.feed_path(user)
+    end
   end
 
   def feed(conn, %{"nickname" => nickname}) do