Merge remote-tracking branch 'origin/develop' into global-status-expiration

[akkoma] / lib / pleroma / web / static_fe / static_fe_view.ex

diff --git a/lib/pleroma/web/static_fe/static_fe_view.ex b/lib/pleroma/web/static_fe/static_fe_view.ex
index 5612a06bb0b01121e543e017ad00000554bb98a4..66d87620c19f6a337d7ace92704b0f9bfaac897a 100644 (file)
--- a/lib/pleroma/web/static_fe/static_fe_view.ex
+++ b/lib/pleroma/web/static_fe/static_fe_view.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.StaticFE.StaticFEView do
@@ -11,7 +11,6 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Gettext
   alias Pleroma.Web.MediaProxy
-  alias Pleroma.Formatter
   alias Pleroma.Web.Metadata.Utils
   alias Pleroma.Web.Router.Helpers
 
@@ -38,4 +37,11 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
   end
 
   def instance_name, do: Pleroma.Config.get([:instance, :name], "Pleroma")
+
+  def open_content? do
+    Pleroma.Config.get(
+      [:frontend_configurations, :collapse_message_with_subjects],
+      true
+    )
+  end
 end