diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-14 02:17:18 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-14 02:17:18 +0000 |
| commit | d6da4a75ce2f07ed07f2acc27f06cc367eea760f (patch) | |
| tree | c8534279ad7a442df42f4d1539f2bfb909cde520 /lib/pleroma/web/federator | |
| parent | 9c499435f046d58b4a56605c190a890b070f5315 (diff) | |
| parent | dcb4711e92382b88326260d7e1951eb66941ed1b (diff) | |
| download | pleroma-1.0.5.tar.gz | |
Merge branch 'release/1.0.5' into 'master'v1.0.5
1.0.5 release
See merge request pleroma/pleroma!1549
Diffstat (limited to 'lib/pleroma/web/federator')
| -rw-r--r-- | lib/pleroma/web/federator/federator.ex | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index f4c9fe284..f4f9e83e0 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -22,6 +22,18 @@ defmodule Pleroma.Web.Federator do refresh_subscriptions() end + @doc "Addresses [memory leaks on recursive replies fetching](https://git.pleroma.social/pleroma/pleroma/issues/161)" + # credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength + def allowed_incoming_reply_depth?(depth) do + max_replies_depth = Pleroma.Config.get([:instance, :federation_incoming_replies_max_depth]) + + if max_replies_depth do + (depth || 1) <= max_replies_depth + else + true + end + end + # Client API def incoming_doc(doc) do |