aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-11 12:13:06 +0000
committerlain <lain@soykaf.club>2019-11-11 12:13:06 +0000
commite73cc742b92ff957c234f395035ade9948088bf0 (patch)
tree6b71d1a382fdb4dbcf2510397bbd59405afc79a4 /lib/pleroma/web/mastodon_api/controllers/account_controller.ex
parent7438c177d9f57e8779b979ca553c3b501726efb3 (diff)
parent94627baa5cca524fe0c4f7043e25d71ed245626a (diff)
downloadpleroma-e73cc742b92ff957c234f395035ade9948088bf0.tar.gz
Merge branch 'new-rate-limiter' into 'develop'
New rate limiter See merge request pleroma/pleroma!1946
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/account_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 73fad519e..5b01b964b 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -66,9 +66,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
@relations [:follow, :unfollow]
@needs_account ~W(followers following lists follow unfollow mute unmute block unblock)a
- plug(RateLimiter, {:relations_id_action, params: ["id", "uri"]} when action in @relations)
- plug(RateLimiter, :relations_actions when action in @relations)
- plug(RateLimiter, :app_account_creation when action == :create)
+ plug(RateLimiter, [name: :relations_id_action, params: ["id", "uri"]] when action in @relations)
+ plug(RateLimiter, [name: :relations_actions] when action in @relations)
+ plug(RateLimiter, [name: :app_account_creation] when action == :create)
plug(:assign_account_by_id when action in @needs_account)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)