diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-05 14:52:09 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-05 14:52:09 +0000 |
| commit | d74985af2381b1c0dae2bc9c79c14582e5c61b97 (patch) | |
| tree | 56116977aaeed3c5efb43888984c514645909030 /lib/pleroma/web/router.ex | |
| parent | 657e1583f8af1ecdf218ba283de4234233bfe5fd (diff) | |
| parent | a43b435c0ad8a1198241fbd18e1a5f1be830f4b5 (diff) | |
| download | pleroma-d74985af2381b1c0dae2bc9c79c14582e5c61b97.tar.gz | |
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 9922a0944..f912cb930 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -571,13 +571,6 @@ defmodule Pleroma.Web.Router do get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe) end - scope "/", Pleroma.Web.ActivityPub do - # XXX: not really ostatus - pipe_through(:ostatus) - - get("/users/:nickname/outbox", ActivityPubController, :outbox) - end - pipeline :ap_service_actor do plug(:accepts, ["activity+json", "json"]) end @@ -602,6 +595,7 @@ defmodule Pleroma.Web.Router do get("/api/ap/whoami", ActivityPubController, :whoami) get("/users/:nickname/inbox", ActivityPubController, :read_inbox) + get("/users/:nickname/outbox", ActivityPubController, :outbox) post("/users/:nickname/outbox", ActivityPubController, :update_outbox) post("/api/ap/upload_media", ActivityPubController, :upload_media) |