diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-15 17:10:27 -0500 |
| commit | ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38 (patch) | |
| tree | b397d1192c69a7d089c86d41b6e09e89954ea798 /lib/pleroma/instances.ex | |
| parent | e912f81c828cc7e1d2c0dff8daed3ad52f407a61 (diff) | |
| parent | 03bcb40883dafa2886110e2b625c4cc5c21106f1 (diff) | |
| download | pleroma-ffb4eb9779ddd28ecee84c06e8dc58f4a4daaa38.tar.gz | |
Merge branch 'develop' into feature/matstodon-statuses-by-name
Diffstat (limited to 'lib/pleroma/instances.ex')
| -rw-r--r-- | lib/pleroma/instances.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/instances.ex b/lib/pleroma/instances.ex index 5e107f4c9..1b05d573c 100644 --- a/lib/pleroma/instances.ex +++ b/lib/pleroma/instances.ex @@ -1,3 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Pleroma.Instances do @moduledoc "Instances context." @@ -13,7 +17,7 @@ defmodule Pleroma.Instances do def reachability_datetime_threshold do federation_reachability_timeout_days = - Pleroma.Config.get(:instance)[:federation_reachability_timeout_days] || 0 + Pleroma.Config.get([:instance, :federation_reachability_timeout_days], 0) if federation_reachability_timeout_days > 0 do NaiveDateTime.add( |