diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 11:43:49 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 11:43:49 +0300 |
| commit | 06b3bb54c5567fe82ad2a015673fffba667997ee (patch) | |
| tree | 84bde8abcef86ef398eef0afdc9ae77e5f464bf1 /lib/pleroma/web/controller_helper.ex | |
| parent | 64095961fe490029886cae358683532ea65bf2c0 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-06b3bb54c5567fe82ad2a015673fffba667997ee.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
| -rw-r--r-- | lib/pleroma/web/controller_helper.ex | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 83b884ba9..9a4e322c9 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -75,4 +75,16 @@ defmodule Pleroma.Web.ControllerHelper do nil -> Pleroma.Web.MastodonAPI.FallbackController.call(conn, {:error, :not_found}) |> halt() end end + + def try_render(conn, target, params) + when is_binary(target) do + case render(conn, target, params) do + nil -> render_error(conn, :not_implemented, "Can't display this activity") + res -> res + end + end + + def try_render(conn, _, _) do + render_error(conn, :not_implemented, "Can't display this activity") + end end |