diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-29 12:17:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-29 12:17:24 -0500 |
| commit | 7c96c82b5bc8cfe20dd8be875550ec2127551779 (patch) | |
| tree | f3060df239ea1b4d68196c3bd9529f9be5d9f12b /lib/pleroma/web/feed | |
| parent | c9e4200ed2167772294fceb4f282979b5ea04981 (diff) | |
| parent | 8871ca5aa35e9533e57b4a15420687869378a981 (diff) | |
| download | pleroma-7c96c82b5bc8cfe20dd8be875550ec2127551779.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into cycles-views
Diffstat (limited to 'lib/pleroma/web/feed')
| -rw-r--r-- | lib/pleroma/web/feed/feed_view.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/feed_view.ex b/lib/pleroma/web/feed/feed_view.ex index df97d2f46..66940f311 100644 --- a/lib/pleroma/web/feed/feed_view.ex +++ b/lib/pleroma/web/feed/feed_view.ex @@ -32,6 +32,7 @@ defmodule Pleroma.Web.Feed.FeedView do %{ activity: activity, + object: object, data: Map.get(object, :data), actor: actor } 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 |