diff options
author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
tree | 80664a6152e92abb37133fede9e3ed72c6801910 /lib/pleroma/web/feed/user_controller.ex | |
parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
-rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index 58d35da1e..fa7879caf 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -28,7 +28,7 @@ defmodule Pleroma.Web.Feed.UserController do def feed_redirect(conn, %{"nickname" => nickname}) do with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do - redirect(conn, external: "#{user_feed_url(conn, :feed, user.nickname)}.atom") + redirect(conn, external: "#{Routes.user_feed_url(conn, :feed, user.nickname)}.atom") end end |