limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Improve string_to_elixir_types/1 with guards

Browse source
This commit is contained in:
Mark Felder 2021-04-13 14:25:15 -05:00
parent 861f192852
commit c3b8c77967
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/config_db.ex
View file

@ -327,7 +327,7 @@ defmodule Pleroma.ConfigDB do
@spec string_to_elixir_types(String.t()) :: @spec string_to_elixir_types(String.t()) ::
atom() | Regex.t() | module() | String.t() | no_return() atom() | Regex.t() | module() | String.t() | no_return()
def string_to_elixir_types("~r" <> _pattern = regex) do def string_to_elixir_types("~r" <> _pattern = regex) when is_binary(regex) do
pattern = pattern =
~r/^~r(?'delimiter'[\/|"'([{<]{1})(?'pattern'.+)[\/|"')\]}>]{1}(?'modifier'[uismxfU]*)/u ~r/^~r(?'delimiter'[\/|"'([{<]{1})(?'pattern'.+)[\/|"')\]}>]{1}(?'modifier'[uismxfU]*)/u
@ -341,9 +341,9 @@ defmodule Pleroma.ConfigDB do
end end
end end
def string_to_elixir_types(":" <> atom), do: String.to_atom(atom) def string_to_elixir_types(":" <> atom) when is_binary(atom), do: String.to_atom(atom)
def string_to_elixir_types(value) do def string_to_elixir_types(value) when is_binary(value) do
if module_name?(value) do if module_name?(value) do
String.to_existing_atom("Elixir." <> value) String.to_existing_atom("Elixir." <> value)
else else
@ -351,6 +351,8 @@ defmodule Pleroma.ConfigDB do
end end
end end
def string_to_elixir_types(value) when is_atom(value), do: value
defp parse_host("localhost"), do: :localhost defp parse_host("localhost"), do: :localhost
defp parse_host(host) do defp parse_host(host) do