bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feed-routes' into 'develop'

Browse source 
Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom

See merge request soapbox-pub/soapbox-be!120
This commit is contained in:
Alex Gleason 2022-03-28 21:58:48 +00:00
commit 9cbd2406cc
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/feed/user_controller.ex
View file

@ -28,9 +28,12 @@ def feed_redirect(%{assigns: %{format: format}} = conn, _params)
ActivityPubController.call(conn, :user) ActivityPubController.call(conn, :user)
end end
def feed_redirect(conn, %{"nickname" => nickname}) do def feed_redirect(%{assigns: assigns} = conn, %{"nickname" => nickname}) do
format = Map.get(assigns, :format, "atom")
format = if format in ["atom", "rss"], do: format, else: "atom"
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
redirect(conn, external: "#{Routes.user_feed_url(conn, :feed, user.nickname)}.atom") redirect(conn, external: "#{Routes.user_feed_url(conn, :feed, user.nickname)}.#{format}")
end end
end end

1
lib/pleroma/web/router.ex
View file

@ -723,6 +723,7 @@ defmodule Pleroma.Web.Router do
# Note: returns user _profile_ for json requests, redirects to user _feed_ for non-json ones # Note: returns user _profile_ for json requests, redirects to user _feed_ for non-json ones
get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed) get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
get("/@:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
end end
scope "/", Pleroma.Web do scope "/", Pleroma.Web do