projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove vapidPublicKey from Nodeinfo
[akkoma]
/
lib
/
pleroma
/
web
/
feed
/
user_controller.ex
diff --git
a/lib/pleroma/web/feed/user_controller.ex
b/lib/pleroma/web/feed/user_controller.ex
index 9ffb3b9be4eafa6cac7e824c062c4f8a371d14b3..e27f859299dbc9f3e47dc83601d2bba6b9df7ee6 100644
(file)
--- a/
lib/pleroma/web/feed/user_controller.ex
+++ b/
lib/pleroma/web/feed/user_controller.ex
@@
-40,6
+40,15
@@
defmodule Pleroma.Web.Feed.UserController do
end
def feed(conn, %{"nickname" => nickname} = params) do
end
def feed(conn, %{"nickname" => nickname} = params) do
+ format = get_format(conn)
+
+ format =
+ if format in ["rss", "atom"] do
+ format
+ else
+ "atom"
+ end
+
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
@@
-50,9
+59,9
@@
defmodule Pleroma.Web.Feed.UserController do
|> ActivityPub.fetch_public_activities()
conn
|> ActivityPub.fetch_public_activities()
conn
- |> put_resp_content_type("application/
atom
+xml")
+ |> put_resp_content_type("application/
#{format}
+xml")
|> put_view(FeedView)
|> put_view(FeedView)
- |> render("user.
xml
",
+ |> render("user.
#{format}
",
user: user,
activities: activities,
feed_config: Pleroma.Config.get([:feed])
user: user,
activities: activities,
feed_config: Pleroma.Config.get([:feed])