summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-13 14:17:17 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-13 14:17:17 +0000
commitf4c001062e51c207bf84f56473ddf6120e3b50fb (patch)
tree0168e773f38bbc3dd1d7c74abe8886bb78fb0669 /config/config.exs
parent9497d14f09dc76535dda47fc4257c51ef07a3f56 (diff)
parentd72876c57dd8f519f63f7bb14abcfaceedf41410 (diff)
downloadpleroma-f4c001062e51c207bf84f56473ddf6120e3b50fb.tar.gz
pleroma-f4c001062e51c207bf84f56473ddf6120e3b50fb.zip
Merge branch '1041-status-actions-rate-limit' into 'develop'
Rate-limited status actions (per user and per user+status). Closes #1041 See merge request pleroma/pleroma!1410
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index eb663f3ec..889238f0f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -521,7 +521,9 @@ config :http_signatures,
config :pleroma, :rate_limit,
search: [{1000, 10}, {1000, 30}],
- app_account_creation: {1_800_000, 25}
+ app_account_creation: {1_800_000, 25},
+ statuses_actions: {10_000, 15},
+ status_id_action: {60_000, 3}
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.