diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 7 | ||||
| -rw-r--r-- | lib/pleroma/web/feed/tag_controller.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 4 | 
3 files changed, 8 insertions, 7 deletions
| diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index c9a3a2585..ad293cda9 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -87,7 +87,8 @@ defmodule Pleroma.Web.ControllerHelper do      render_error(conn, :not_implemented, "Can't display this activity")    end -  @spec put_in_if_exist(map(), atom() | String.t(), any) :: map() -  def put_in_if_exist(map, _key, nil), do: map -  def put_in_if_exist(map, key, value), do: put_in(map, key, value) +  @spec put_if_exist(map(), atom() | String.t(), any) :: map() +  def put_if_exist(map, _key, nil), do: map + +  def put_if_exist(map, key, value), do: Map.put(map, key, value)  end diff --git a/lib/pleroma/web/feed/tag_controller.ex b/lib/pleroma/web/feed/tag_controller.ex index 75c9ea17e..904047b12 100644 --- a/lib/pleroma/web/feed/tag_controller.ex +++ b/lib/pleroma/web/feed/tag_controller.ex @@ -9,14 +9,14 @@ defmodule Pleroma.Web.Feed.TagController do    alias Pleroma.Web.ActivityPub.ActivityPub    alias Pleroma.Web.Feed.FeedView -  import Pleroma.Web.ControllerHelper, only: [put_in_if_exist: 3] +  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_in_if_exist("max_id", params["max_id"]) +      |> put_if_exist("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 9ba602d9f..9ffb3b9be 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -11,7 +11,7 @@ defmodule Pleroma.Web.Feed.UserController do    alias Pleroma.Web.ActivityPub.ActivityPubController    alias Pleroma.Web.Feed.FeedView -  import Pleroma.Web.ControllerHelper, only: [put_in_if_exist: 3] +  import Pleroma.Web.ControllerHelper, only: [put_if_exist: 3]    plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect]) @@ -46,7 +46,7 @@ defmodule Pleroma.Web.Feed.UserController do            "type" => ["Create"],            "actor_id" => user.ap_id          } -        |> put_in_if_exist("max_id", params["max_id"]) +        |> put_if_exist("max_id", params["max_id"])          |> ActivityPub.fetch_public_activities()        conn | 
