From: lain <lain@soykaf.club>
Date: Tue, 11 Jun 2019 11:32:01 +0000 (+0000)
Subject: Merge branch 'feature/rate-limiter' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=63ab3c30ebb33241074cb252c449cd7879b77870;p=akkoma

Merge branch 'feature/rate-limiter' into 'develop'

Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
---

63ab3c30ebb33241074cb252c449cd7879b77870
diff --cc config/config.exs
index 95a0e9972,3d2c6d48e..0642ee3c3
--- a/config/config.exs
+++ b/config/config.exs
@@@ -244,11 -244,9 +244,9 @@@ config :pleroma, :instance
    safe_dm_mentions: false,
    healthcheck: false,
    remote_post_retention_days: 90,
 -  skip_thread_containment: false,
 +  skip_thread_containment: true,
    limit_unauthenticated_to_local_content: true
  
- config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
- 
  config :pleroma, :markup,
    # XXX - unfortunately, inline images must be enabled by default right now, because
    # of custom emoji.  Issue #275 discusses defanging that somehow.