From 593b8b1e6a8502cca9bf5559b8bec86f172bbecb Mon Sep 17 00:00:00 2001 From: lain Date: Fri, 7 Jun 2019 14:28:14 +0200 Subject: [PATCH 1/2] 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. --- CHANGELOG.md | 1 + config/config.exs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 76fc4c92bb39dd5d6f4349482cb57419c0f0f93e Mon Sep 17 00:00:00 2001 From: lain Date: Fri, 7 Jun 2019 17:16:56 +0200 Subject: [PATCH 2/2] Fix tests. --- config/test.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/test.exs b/config/test.exs index 7861b9598..6d4fcf7d0 100644 --- a/config/test.exs +++ b/config/test.exs @@ -27,7 +27,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test config :pleroma, :instance, email: "admin@example.com", - notify_email: "noreply@example.com" + notify_email: "noreply@example.com", + skip_thread_containment: false # Configure your database config :pleroma, Pleroma.Repo,