diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
| commit | a92c713d9c761563c72d0f660574878aa569249a (patch) | |
| tree | ce88697749dbe26331b255883b4fa9631002e8b4 /lib/pleroma/web/controller_helper.ex | |
| parent | 270c3fe446a374202b6d64ce487f7df29ecb1c14 (diff) | |
| parent | 0dd863f8f53d30d37e35d4ec2c4e34d09a266a85 (diff) | |
| download | pleroma-a92c713d9c761563c72d0f660574878aa569249a.tar.gz | |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 4780081b2..eb97ae975 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -82,8 +82,9 @@ defmodule Pleroma.Web.ControllerHelper do end end - def assign_account_by_id(%{params: %{"id" => id}} = conn, _) do - case Pleroma.User.get_cached_by_id(id) do + def assign_account_by_id(conn, _) do + # TODO: use `conn.params[:id]` only after moving to OpenAPI + case Pleroma.User.get_cached_by_id(conn.params[:id] || conn.params["id"]) do %Pleroma.User{} = account -> assign(conn, :account, account) nil -> Pleroma.Web.MastodonAPI.FallbackController.call(conn, {:error, :not_found}) |> halt() end |