AkkomaGang/linkify
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add own trim functions that only strips one character

Browse source 
This makes it possible to support URLs that end in ) but are in another ()
This commit is contained in:
Mark Felder 2021-01-27 15:49:42 -06:00
parent 14e1f64a09
commit 75f68977af
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/linkify/parser.ex
View file

@ -202,7 +202,7 @@ defmodule Linkify.Parser do
end end
defp maybe_strip_parens(buffer) do defp maybe_strip_parens(buffer) do
trimmed = String.trim_leading(buffer, "(") trimmed = trim_leading_paren(buffer)
with :next <- parens_check_trailing(buffer), with :next <- parens_check_trailing(buffer),
:next <- parens_found_email(trimmed), :next <- parens_found_email(trimmed),
@ -212,10 +212,10 @@ defmodule Linkify.Parser do
:next <- parens_found_path_separator(path), :next <- parens_found_path_separator(path),
:next <- parens_path_has_open_paren(path), :next <- parens_path_has_open_paren(path),
:next <- parens_check_balanced(trimmed) do :next <- parens_check_balanced(trimmed) do
buffer |> String.trim_leading("(") |> String.trim_trailing(")") buffer |> trim_leading_paren |> trim_trailing_paren
else else
:both -> buffer |> String.trim_leading("(") |> String.trim_trailing(")") :both -> buffer |> trim_leading_paren |> trim_trailing_paren
:leading_only -> buffer |> String.trim_leading("(") :leading_only -> buffer |> trim_leading_paren
:noop -> buffer :noop -> buffer
_ -> buffer _ -> buffer
end end
@ -224,10 +224,10 @@ defmodule Linkify.Parser do
defp parens_check_trailing(buffer), do: (String.ends_with?(buffer, ")") && :next) || :noop defp parens_check_trailing(buffer), do: (String.ends_with?(buffer, ")") && :next) || :noop
defp parens_found_email(trimmed), defp parens_found_email(trimmed),
do: (String.trim_trailing(trimmed, ")") |> email?(nil) && :both) || :next do: (trim_trailing_paren(trimmed) |> email?(nil) && :both) || :next
defp parens_found_url(trimmed), defp parens_found_url(trimmed),
do: (String.trim_trailing(trimmed, ")") |> url?(nil) && :next) || :noop do: (trim_trailing_paren(trimmed) |> url?(nil) && :next) || :noop
defp parens_in_query(query), do: (is_nil(query) && :next) || :both defp parens_in_query(query), do: (is_nil(query) && :next) || :both
defp parens_found_path_separator(path), do: (String.contains?(path, "/") && :next) || :both defp parens_found_path_separator(path), do: (String.contains?(path, "/") && :next) || :both
@ -245,6 +245,16 @@ defmodule Linkify.Parser do
end end
end end
defp trim_leading_paren(buffer),
do:
(String.starts_with?(buffer, "(") && String.slice(buffer, 1, String.length(buffer))) ||
buffer
defp trim_trailing_paren(buffer),
do:
(String.ends_with?(buffer, ")") && String.slice(buffer, 0, String.length(buffer) - 1)) ||
buffer
defp strip_punctuation(buffer), do: String.replace(buffer, @delimiters, "") defp strip_punctuation(buffer), do: String.replace(buffer, @delimiters, "")
def url?(buffer, opts) do def url?(buffer, opts) do