Merge branch 'develop' into 'fix/oauth-compile-time'

[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 c19aa07e1d4c0c08062884e8dc4e55037bffd84c..821ece9a9a35d2d8eafc5c112a7f5f455bb367af 100644 (file)
--- a/lib/pleroma/web/static_fe/static_fe_view.ex
+++ b/lib/pleroma/web/static_fe/static_fe_view.ex
@@ -5,10 +5,12 @@
 defmodule Pleroma.Web.StaticFE.StaticFEView do
   use Pleroma.Web, :view
 
+  alias Calendar.Strftime
+  alias Pleroma.Emoji.Formatter
   alias Pleroma.User
+  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
 
@@ -31,6 +33,15 @@ defmodule Pleroma.Web.StaticFE.StaticFEView do
 
   def format_date(date) do
     {:ok, date, _} = DateTime.from_iso8601(date)
-    Pleroma.Web.CommonAPI.Utils.format_asctime(date)
+    Strftime.strftime!(date, "%Y/%m/%d %l:%M:%S %p UTC")
+  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