aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-07 14:28:14 +0200
committerlain <lain@soykaf.club>2019-06-07 14:28:14 +0200
commit593b8b1e6a8502cca9bf5559b8bec86f172bbecb (patch)
tree74017aa11e21f01510999b76c0d1e0caad759ecc
parentd5330ed12561377e5c464bcc2774ebc692b9ac07 (diff)
downloadpleroma-593b8b1e6a8502cca9bf5559b8bec86f172bbecb.tar.gz
Configuration: Skip thread containment by default
In my tests the interaction between thread containment and other restrictions makes postgresql create some very bad query plans. This caused direct messages to time out on soykaf, for example.
-rw-r--r--CHANGELOG.md1
-rw-r--r--config/config.exs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf2232b09..da5a9aa99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Changed
- **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
+- Thread containment / test for complete visibility will be skipped by default.
- Enforcement of OAuth scopes
- Add multiple use/time expiring invite token
- Restyled OAuth pages to fit with Pleroma's default theme
diff --git a/config/config.exs b/config/config.exs
index c6bf71fc8..95a0e9972 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -244,7 +244,7 @@ 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