diff options
| author | lain <lain@soykaf.club> | 2020-06-08 11:19:18 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-08 11:19:18 +0200 |
| commit | 3b5282bef29656f081750a0d9b06a42b912520de (patch) | |
| tree | 137cb16526ef91c507fbdfec4b0d655d180d2d57 /lib/pleroma/web/controller_helper.ex | |
| parent | 89b85f65297ef4b8ce92eacb27c90e8f7c874f54 (diff) | |
| parent | a1aa9fa91320d527e93435fe236534003cd85d31 (diff) | |
| download | pleroma-3b5282bef29656f081750a0d9b06a42b912520de.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 9414cf3f2..5d67d75b5 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -93,8 +93,7 @@ defmodule Pleroma.Web.ControllerHelper do end 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 + case Pleroma.User.get_cached_by_id(conn.params.id) do %Pleroma.User{} = account -> assign(conn, :account, account) nil -> Pleroma.Web.MastodonAPI.FallbackController.call(conn, {:error, :not_found}) |> halt() end |