diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-08-22 21:13:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-08-22 21:13:03 +0300 |
| commit | f95b67c9339466767cd8ce9f3e05493ed3127408 (patch) | |
| tree | 723e77c3c780142f29f91c1ce1909135a57c0352 /lib | |
| parent | 64bfb41c553a45855e86737298185c1395bbb350 (diff) | |
| parent | 0e50e9e4fa5a5d33d36f4226e1d32a00bf53fc72 (diff) | |
| download | pleroma-f95b67c9339466767cd8ce9f3e05493ed3127408.tar.gz pleroma-f95b67c9339466767cd8ce9f3e05493ed3127408.zip | |
Merge branch 'develop' into issue/1177
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus_controller.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex index 305901dfd..fdba0f77f 100644 --- a/lib/pleroma/web/ostatus/ostatus_controller.ex +++ b/lib/pleroma/web/ostatus/ostatus_controller.ex @@ -22,7 +22,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do alias Pleroma.Web.Router alias Pleroma.Web.XML - plug(Pleroma.Plugs.RateLimiter, :ap_routes when action in [:object, :activity]) + plug( + Pleroma.Plugs.RateLimiter, + {:ap_routes, params: ["uuid"]} when action in [:object, :activity] + ) plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming]) |