diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-06 09:30:49 +0300 |
| commit | f459aabdfafa990b33610438650f882ccac072d2 (patch) | |
| tree | e5bfcb4f8fc7c2dd06e08f90b3a841c4f9ad759a /lib/pleroma/web/controller_helper.ex | |
| parent | 6ffa2b5f661c2db424334c6fb5de6f4d1bfeb745 (diff) | |
| parent | 9e34919dcdbeedf8eb623dc86b05f63ef44d8859 (diff) | |
| download | pleroma-f459aabdfafa990b33610438650f882ccac072d2.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
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 |