aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controller_helper.ex
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-01 07:11:54 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-01 07:11:54 +0000
commitf0b4ba1bf9023c4300e1e67aa4666f05cab8409e (patch)
tree2b269d3914bd89300751b95c31ce03e4fbe91492 /lib/pleroma/web/controller_helper.ex
parent703deb66d9346e0c8a160ec6c138b3b53b5183b6 (diff)
parent36a34c36fe518dae23fb19d02ccb43de8c2621dd (diff)
downloadpleroma-f0b4ba1bf9023c4300e1e67aa4666f05cab8409e.tar.gz
Merge branch 'split-masto-api/polls' into 'develop'
Extract poll actions from `MastodonAPIController` to `PollController` See merge request pleroma/pleroma!1755
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r--lib/pleroma/web/controller_helper.ex12
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