diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
| commit | 905bb11747fb87f2ad960175e1fc73aa0e3657a0 (patch) | |
| tree | c92908b5d32c4f84f98807b655c726e0d5a88674 /lib/pleroma/web/controller_helper.ex | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| parent | c55facf78b6714947d8c5b02b76846f5f2ae7744 (diff) | |
| download | pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.tar.gz | |
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index e90bf842e..83b884ba9 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -68,4 +68,11 @@ defmodule Pleroma.Web.ControllerHelper do conn end end + + def assign_account_by_id(%{params: %{"id" => id}} = conn, _) do + case Pleroma.User.get_cached_by_id(id) do + %Pleroma.User{} = account -> assign(conn, :account, account) + nil -> Pleroma.Web.MastodonAPI.FallbackController.call(conn, {:error, :not_found}) |> halt() + end + end end |