projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
giant massive dep upgrade and dialyxir-found error emporium (#371)
[akkoma]
/
lib
/
pleroma
/
web
/
akkoma_api
/
controllers
/
translation_controller.ex
diff --git
a/lib/pleroma/web/akkoma_api/controllers/translation_controller.ex
b/lib/pleroma/web/akkoma_api/controllers/translation_controller.ex
index 49ef89a508774c8a8d48f34e86f1e7070d61ca41..022da31988ea966273a370d0a6de34609f483ec3 100644
(file)
--- a/
lib/pleroma/web/akkoma_api/controllers/translation_controller.ex
+++ b/
lib/pleroma/web/akkoma_api/controllers/translation_controller.ex
@@
-3,6
+3,8
@@
defmodule Pleroma.Web.AkkomaAPI.TranslationController do
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.OAuthScopesPlug
+ require Logger
+
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
@unauthenticated_access %{fallback: :proceed_unauthenticated, scopes: []}
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
@unauthenticated_access %{fallback: :proceed_unauthenticated, scopes: []}
@@
-21,11
+23,17
@@
defmodule Pleroma.Web.AkkomaAPI.TranslationController do
@doc "GET /api/v1/akkoma/translation/languages"
def languages(conn, _params) do
@doc "GET /api/v1/akkoma/translation/languages"
def languages(conn, _params) do
- with {:ok, languages} <- get_languages() do
+ with {:enabled, true} <- {:enabled, Pleroma.Config.get([:translator, :enabled])},
+ {:ok, source_languages, dest_languages} <- get_languages() do
conn
conn
- |> json(
languages
)
+ |> json(
%{source: source_languages, target: dest_languages}
)
else
else
- e -> IO.inspect(e)
+ {:enabled, false} ->
+ json(conn, %{})
+
+ e ->
+ Logger.error("Translation language list error: #{inspect(e)}")
+ {:error, e}
end
end
end
end
@@
-33,8
+41,8
@@
defmodule Pleroma.Web.AkkomaAPI.TranslationController do
module = Pleroma.Config.get([:translator, :module])
@cachex.fetch!(:translations_cache, "languages:#{module}}", fn _ ->
module = Pleroma.Config.get([:translator, :module])
@cachex.fetch!(:translations_cache, "languages:#{module}}", fn _ ->
- with {:ok, languages} <- module.languages() do
- {:ok, languages}
+ with {:ok,
source_languages, dest_
languages} <- module.languages() do
+ {:ok,
source_languages, dest_
languages}
else
{:error, err} -> {:ignore, {:error, err}}
end
else
{:error, err} -> {:ignore, {:error, err}}
end