diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-03 09:54:17 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-03 09:54:17 +0200 |
| commit | 9c42453e068b683517f6a72602c08527222f8fea (patch) | |
| tree | b9b00b3a472ff7b0a88e6ad19b2e2f85ecb9b8b8 /lib/pleroma/web/router.ex | |
| parent | 018a1a390fdb72652c615c28ac36f1b9a6a84d82 (diff) | |
| download | pleroma-9c42453e068b683517f6a72602c08527222f8fea.tar.gz | |
Return note objects as ostatus post activities.
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index b0c1dcd91..ac9d97e0f 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -73,6 +73,8 @@ defmodule Pleroma.Web.Router do scope "/", Pleroma.Web do pipe_through :ostatus + get "/objects/:uuid", OStatus.OStatusController, :object + get "/users/:nickname/feed", OStatus.OStatusController, :feed get "/users/:nickname", OStatus.OStatusController, :feed_redirect post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming @@ -96,5 +98,5 @@ end defmodule Fallback.RedirectController do use Pleroma.Web, :controller - def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html") + def redirector(conn, _params), do: (if Mix.env != :test, do: send_file(conn, 200, "priv/static/index.html")) end |