From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 5 Jun 2019 05:54:30 +0000 (+0700)
Subject: Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6ba9055b51a454baaf063943e72a39006f7e5fad;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
---

6ba9055b51a454baaf063943e72a39006f7e5fad
diff --cc CHANGELOG.md
index 99b42e280,2fa9bd1e7..4766aef6c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -50,7 -50,7 +50,8 @@@ The format is based on [Keep a Changelo
  - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
  - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
  - MRF: Support for running subchains.
 +- Addressable lists
+ - Configuration: `skip_thread_containment` option
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index 47115aa6e,c0e3d1478..73c6e4cbf
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -860,7 -866,13 +865,11 @@@ defmodule Pleroma.Web.ActivityPub.Activ
    defp maybe_order(query, _), do: query
  
    def fetch_activities_query(recipients, opts \\ %{}) do
 -    base_query = from(activity in Activity)
 -
+     config = %{
+       skip_thread_containment: Config.get([:instance, :skip_thread_containment])
+     }
+ 
 -    base_query
 +    Activity
      |> maybe_preload_objects(opts)
      |> maybe_preload_bookmarks(opts)
      |> maybe_set_thread_muted_field(opts)