diff options
| author | lain <lain@soykaf.club> | 2020-06-05 16:53:56 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-05 16:53:56 +0200 |
| commit | a8ca030d85368285af1b960e14dab5b847ecb35a (patch) | |
| tree | 5d8c8922eea940f455946435c073d534df1dec57 /lib/pleroma/web/feed/user_controller.ex | |
| parent | 115d08a7542b92c5e1d889da41c0ee6837a1235e (diff) | |
| parent | 657e1583f8af1ecdf218ba283de4234233bfe5fd (diff) | |
| download | pleroma-a8ca030d85368285af1b960e14dab5b847ecb35a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index 5a6fc9de0..7c2e0d522 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -11,8 +11,6 @@ defmodule Pleroma.Web.Feed.UserController do alias Pleroma.Web.ActivityPub.ActivityPubController alias Pleroma.Web.Feed.FeedView - import Pleroma.Web.ControllerHelper, only: [put_if_exist: 3] - plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect]) action_fallback(:errors) @@ -55,7 +53,7 @@ defmodule Pleroma.Web.Feed.UserController do "type" => ["Create"], "actor_id" => user.ap_id } - |> put_if_exist("max_id", params["max_id"]) + |> Pleroma.Maps.put_if_present("max_id", params["max_id"]) |> ActivityPub.fetch_public_or_unlisted_activities() conn |