diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-05 23:15:10 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-05 23:15:10 +0400 |
| commit | b02df1803e16b40ad8a30465604e2892b6d65e6f (patch) | |
| tree | 8d60100ab9fdb8ebe29b0ceff3655e71570d30bd /lib/pleroma/web/feed | |
| parent | 317e2b8d6126d86eafb493fe6c3b7a29af65ee21 (diff) | |
| parent | d74985af2381b1c0dae2bc9c79c14582e5c61b97 (diff) | |
| download | pleroma-b02df1803e16b40ad8a30465604e2892b6d65e6f.tar.gz | |
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
Diffstat (limited to 'lib/pleroma/web/feed')
| -rw-r--r-- | lib/pleroma/web/feed/tag_controller.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/web/feed/tag_controller.ex b/lib/pleroma/web/feed/tag_controller.ex index 3404d2856..39b2a766a 100644 --- a/lib/pleroma/web/feed/tag_controller.ex +++ b/lib/pleroma/web/feed/tag_controller.ex @@ -9,14 +9,12 @@ defmodule Pleroma.Web.Feed.TagController do alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.Feed.FeedView - import Pleroma.Web.ControllerHelper, only: [put_if_exist: 3] - def feed(conn, %{"tag" => raw_tag} = params) do {format, tag} = parse_tag(raw_tag) activities = %{type: ["Create"], tag: tag} - |> put_if_exist(:max_id, params["max_id"]) + |> Pleroma.Maps.put_if_present(:max_id, params["max_id"]) |> ActivityPub.fetch_public_activities() conn diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index 7bf9bd3e3..d56f43818 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 |