projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/tag_feed' into 'develop'
[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 6128b24975cc9046e063cb649f5e617bd46d1ea0..821ece9a9a35d2d8eafc5c112a7f5f455bb367af 100644
(file)
--- a/
lib/pleroma/web/static_fe/static_fe_view.ex
+++ b/
lib/pleroma/web/static_fe/static_fe_view.ex
@@
-8,9
+8,9
@@
defmodule Pleroma.Web.StaticFE.StaticFEView do
alias Calendar.Strftime
alias Pleroma.Emoji.Formatter
alias Pleroma.User
alias Calendar.Strftime
alias Pleroma.Emoji.Formatter
alias Pleroma.User
+ alias Pleroma.Web.Endpoint
alias Pleroma.Web.Gettext
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.Gettext
alias Pleroma.Web.MediaProxy
- alias Pleroma.Formatter
alias Pleroma.Web.Metadata.Utils
alias Pleroma.Web.Router.Helpers
alias Pleroma.Web.Metadata.Utils
alias Pleroma.Web.Router.Helpers
@@
-35,4
+35,13
@@
defmodule Pleroma.Web.StaticFE.StaticFEView do
{:ok, date, _} = DateTime.from_iso8601(date)
Strftime.strftime!(date, "%Y/%m/%d %l:%M:%S %p UTC")
end
{:ok, date, _} = DateTime.from_iso8601(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
end