projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs/kyclos' into 'develop'
[akkoma]
/
lib
/
pleroma
/
config
/
config_db.ex
diff --git
a/lib/pleroma/config/config_db.ex
b/lib/pleroma/config/config_db.ex
index 91a1aa0cc2cf3781bf0b759ed2382418bea8a492..119251bee9b5f9eb83f100f8cddf17db09976621 100644
(file)
--- a/
lib/pleroma/config/config_db.ex
+++ b/
lib/pleroma/config/config_db.ex
@@
-236,15
+236,7
@@
defmodule Pleroma.ConfigDB do
end
@spec from_string(String.t()) :: atom() | no_return()
end
@spec from_string(String.t()) :: atom() | no_return()
- def from_string(":" <> entity), do: String.to_existing_atom(entity)
-
- def from_string(entity) when is_binary(entity) do
- if is_module_name?(entity) do
- String.to_existing_atom("Elixir.#{entity}")
- else
- entity
- end
- end
+ def from_string(string), do: do_transform_string(string)
@spec convert(any()) :: any()
def convert(entity), do: do_convert(entity)
@spec convert(any()) :: any()
def convert(entity), do: do_convert(entity)
@@
-416,7
+408,7
@@
defmodule Pleroma.ConfigDB do
@spec is_module_name?(String.t()) :: boolean()
def is_module_name?(string) do
@spec is_module_name?(String.t()) :: boolean()
def is_module_name?(string) do
- Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth)\./, string) or
+ Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth
|Swoosh
)\./, string) or
string in ["Oban", "Ueberauth", "ExSyslogger"]
end
end
string in ["Oban", "Ueberauth", "ExSyslogger"]
end
end