diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-22 04:05:41 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-22 04:05:41 +0000 |
| commit | ab6e15622b0977a50408f4afb874e0b5b1704d2f (patch) | |
| tree | 199c59576ffd36e95c3632862610252c7aefdf2e /lib | |
| parent | 334ffcb86fbd88da33f0a6ab392e599f969a4112 (diff) | |
| parent | f76268135c014c20a482d30a7c9596ec2e7d6a69 (diff) | |
| download | pleroma-ab6e15622b0977a50408f4afb874e0b5b1704d2f.tar.gz pleroma-ab6e15622b0977a50408f4afb874e0b5b1704d2f.zip | |
Merge branch 'fix/api-fallback' into 'develop'
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 4c29b24eb..49e28cc2d 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -710,6 +710,7 @@ defmodule Pleroma.Web.Router do scope "/", Fallback do get("/registration/:token", RedirectController, :registration_page) get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta) + get("/api*path", RedirectController, :api_not_implemented) get("/*path", RedirectController, :redirector) options("/*path", RedirectController, :empty) @@ -721,6 +722,12 @@ defmodule Fallback.RedirectController do alias Pleroma.User alias Pleroma.Web.Metadata + def api_not_implemented(conn, _params) do + conn + |> put_status(404) + |> json(%{error: "Not implemented"}) + end + def redirector(conn, _params, code \\ 200) do conn |> put_resp_content_type("text/html") |