aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-06-12 12:52:40 +0200
committerRoger Braun <roger@rogerbraun.net>2017-06-12 12:52:40 +0200
commita1cabeea4aad2101361b35c47c1bc03e033b4d7c (patch)
tree98bb0399e5977fb15e777f977ccf3e8a23b5908e /lib
parent6342fcd5dca2fc4c1241163a406ca78103082048 (diff)
downloadpleroma-a1cabeea4aad2101361b35c47c1bc03e033b4d7c.tar.gz
Redirect html user profile request.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus_controller.ex6
1 files changed, 5 insertions, 1 deletions
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