projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into activation-meta
[akkoma]
/
lib
/
pleroma
/
web
/
preload
/
status_net.ex
diff --git
a/lib/pleroma/web/preload/status_net.ex
b/lib/pleroma/web/preload/status_net.ex
index 367442d5c035cfc1aab19108ef7290d31ce10e6a..9b62f87a2da108f4a4d718d877fc6e5bbb2f326b 100644
(file)
--- a/
lib/pleroma/web/preload/status_net.ex
+++ b/
lib/pleroma/web/preload/status_net.ex
@@
-4,10
+4,10
@@
defmodule Pleroma.Web.Preload.Providers.StatusNet do
alias Pleroma.Web.Preload.Providers.Provider
defmodule Pleroma.Web.Preload.Providers.StatusNet do
alias Pleroma.Web.Preload.Providers.Provider
- alias Pleroma.Web.TwitterAPI.Util
View
+ alias Pleroma.Web.TwitterAPI.Util
Controller
@behaviour Provider
@behaviour Provider
- @config_url
:
"/api/statusnet/config.json"
+ @config_url "/api/statusnet/config.json"
@impl Provider
def generate_terms(_params) do
@impl Provider
def generate_terms(_params) do
@@
-16,9
+16,10
@@
defmodule Pleroma.Web.Preload.Providers.StatusNet do
end
defp build_config_tag(acc) do
end
defp build_config_tag(acc) do
- instance = Pleroma.Config.get(:instance)
- info_data = UtilView.status_net_config(instance)
+ resp =
+ Plug.Test.conn(:get, @config_url |> to_string())
+ |> UtilController.config(nil)
- Map.put(acc, @config_url,
info_data
)
+ Map.put(acc, @config_url,
resp.resp_body
)
end
end
end
end