projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
ostatus_controller.ex
diff --git
a/lib/pleroma/web/ostatus/ostatus_controller.ex
b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 6958519de05d95acfadeecd749af7a52ec82d778..12a7c2365446e8ba67754b3de17af8a25bc14cd7 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/
lib/pleroma/web/ostatus/ostatus_controller.ex
@@
-8,6
+8,7
@@
defmodule Pleroma.Web.OStatus.OStatusController do
alias Fallback.RedirectController
alias Pleroma.Activity
alias Pleroma.Object
alias Fallback.RedirectController
alias Pleroma.Activity
alias Pleroma.Object
+ alias Pleroma.Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.ObjectView
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.ObjectView
@@
-17,8
+18,8
@@
defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Web.Router
plug(
alias Pleroma.Web.Router
plug(
-
Pleroma.Plugs.
RateLimiter,
-
{:ap_routes, params: ["uuid"]}
when action in [:object, :activity]
+ RateLimiter,
+
[name: :ap_routes, params: ["uuid"]]
when action in [:object, :activity]
)
plug(
)
plug(