moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better configuration

This commit is contained in:
Hakaba Hitoyo 2018-07-18 09:58:59 +09:00
parent 5b4a21317d
commit e4dd58307a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.exs
View File

@ -95,10 +95,10 @@
ip: {0, 0, 0, 0}, ip: {0, 0, 0, 0},
port: 9999 port: 9999
config :pleroma, :suggestions, third_party_engine: false config :pleroma, :suggestions,
# config :pleroma, :suggestions, enabled: false,
# third_party_engine: third_party_engine:
# "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}" "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}"
# Import environment specific config. This must remain at the bottom # Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above. # of this file so it overrides the configuration defined above.

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1076,9 +1076,9 @@ def errors(conn, _) do
@suggestions Application.get_env(:pleroma, :suggestions) @suggestions Application.get_env(:pleroma, :suggestions)
def suggestions(%{assigns: %{user: user}} = conn, _) do def suggestions(%{assigns: %{user: user}} = conn, _) do
if Keyword.get(@suggestions, :enabled, false) do
api = Keyword.get(@suggestions, :third_party_engine, false) api = Keyword.get(@suggestions, :third_party_engine, false)
if api do
host = host =
Application.get_env(:pleroma, Pleroma.Web.Endpoint) Application.get_env(:pleroma, Pleroma.Web.Endpoint)
|> Keyword.get(:url) |> Keyword.get(:url)

1
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
View File

@ -45,6 +45,7 @@ def nodeinfo(conn, %{"version" => "2.0"}) do
metadata: %{ metadata: %{
nodeName: Keyword.get(instance, :name), nodeName: Keyword.get(instance, :name),
mediaProxy: Keyword.get(media_proxy, :enabled), mediaProxy: Keyword.get(media_proxy, :enabled),
suggestions: Keyword.get(suggestions, :enabled, false),
suggestionsThirdPartyEngine: Keyword.get(suggestions, :third_party_engine, false) suggestionsThirdPartyEngine: Keyword.get(suggestions, :third_party_engine, false)
} }
} }