diff options
author | lain <lain@soykaf.club> | 2020-08-18 12:38:13 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-18 12:38:13 +0200 |
commit | 548ca43bcf9ed72a70bd98f074241dbb0e7801ec (patch) | |
tree | e32fafa13056d489c27a0b7a4afab6ca641b14ba /lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | |
parent | 7a273087ed7b49dedd821ca69a6e09d5f893c913 (diff) | |
parent | 34b099fffa64c20d42c417abb06e0e32a5ad296a (diff) | |
download | pleroma-548ca43bcf9ed72a70bd98f074241dbb0e7801ec.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex')
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index ab7b1d6aa..9244316ed 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -8,6 +8,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2, add_link_headers: 3] + alias Pleroma.Config alias Pleroma.Pagination alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug alias Pleroma.Plugs.OAuthScopesPlug @@ -89,11 +90,11 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do end defp restrict_unauthenticated?(true = _local_only) do - Pleroma.Config.get([:restrict_unauthenticated, :timelines, :local]) + Config.restrict_unauthenticated_access?(:timelines, :local) end defp restrict_unauthenticated?(_) do - Pleroma.Config.get([:restrict_unauthenticated, :timelines, :federated]) + Config.restrict_unauthenticated_access?(:timelines, :federated) end # GET /api/v1/timelines/public |