projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-domain
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
util_view.ex
diff --git
a/lib/pleroma/web/twitter_api/views/util_view.ex
b/lib/pleroma/web/twitter_api/views/util_view.ex
index d3bdb4f6230662f7cf62e57672dc352729ebc145..98eea1d182f019cc82cb270131589cc76ee792c6 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/util_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/util_view.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilView do
use Pleroma.Web, :view
import Phoenix.HTML.Form
defmodule Pleroma.Web.TwitterAPI.UtilView do
use Pleroma.Web, :view
import Phoenix.HTML.Form
+ alias Pleroma.Config
alias Pleroma.Web
def status_net_config(instance) do
alias Pleroma.Web
def status_net_config(instance) do
@@
-19,4
+20,9
@@
defmodule Pleroma.Web.TwitterAPI.UtilView do
</config>
"""
end
</config>
"""
end
+
+ def render("frontend_configurations.json", _) do
+ Config.get(:frontend_configurations, %{})
+ |> Enum.into(%{})
+ end
end
end