diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-22 21:01:28 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-22 21:01:28 +0300 |
| commit | 7101ba1a21ded292ba057f9aadec1756914b45e0 (patch) | |
| tree | 6ee1e10eba5b579d7e469ac8a340bb496f564411 /lib | |
| parent | 256ff09aa8068166a9f83e3159f060fd4598af76 (diff) | |
| parent | 0e50e9e4fa5a5d33d36f4226e1d32a00bf53fc72 (diff) | |
| download | pleroma-7101ba1a21ded292ba057f9aadec1756914b45e0.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus_controller.ex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index c70063b84..fdba0f77f 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -22,6 +22,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do alias Pleroma.Web.Router alias Pleroma.Web.XML + plug( + Pleroma.Plugs.RateLimiter, + {:ap_routes, params: ["uuid"]} when action in [:object, :activity] + ) + plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming]) plug( |