Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do nothing if configuration is skipped

Browse Source
This commit is contained in:
Hakaba Hitoyo 2018-07-17 16:45:18 +09:00
parent df3233e7e7
commit d76f0d87be
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.exs
View File

@ -95,9 +95,9 @@ config :pleroma, :gopher,
ip: {0, 0, 0, 0}, ip: {0, 0, 0, 0},
port: 9999 port: 9999
config :pleroma, :suggestions, # config :pleroma, :suggestions,
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.

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

@ -1076,13 +1076,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController 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
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)
|> Keyword.get(:host) |> Keyword.get(:host)
user = user.nickname user = user.nickname
api = Keyword.get(@suggestions, :third_party_engine, "")
url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user) url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
with {:ok, %{status_code: 200, body: body}} <- with {:ok, %{status_code: 200, body: body}} <-
@ -1099,5 +1101,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
else else
e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}") e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}")
end end
else
json(conn, [])
end
end end
end end