From 7005cda9e48b746b1ce2004fc921eb75fc8d9310 Mon Sep 17 00:00:00 2001 From: Sergey Suprunenko Date: Wed, 2 Sep 2020 13:18:02 +0200 Subject: [PATCH] Handle punctuation marks and new lines --- lib/linkify/parser.ex | 67 +++++++++++++++++++++++++------------- test/linkify_test.exs | 75 ++++++++++++++++++++++++++++++++++++++++++- test/parser_test.exs | 10 ++++-- 3 files changed, 126 insertions(+), 26 deletions(-) diff --git a/lib/linkify/parser.ex b/lib/linkify/parser.ex index 023b3b5..3074be3 100644 --- a/lib/linkify/parser.ex +++ b/lib/linkify/parser.ex @@ -24,6 +24,8 @@ defmodule Linkify.Parser do @match_skipped_tag ~r/^(?(a|code|pre)).*>*/ + @delimiters ~r/[,.;:>]*$/ + @prefix_extra [ "magnet:?", "dweb://", @@ -56,7 +58,7 @@ defmodule Linkify.Parser do ~s{Check out google.com} """ - @types [:url, :email, :hashtag, :mention, :extra] + @types [:url, :email, :hashtag, :extra, :mention] def parse(input, opts \\ %{}) def parse(input, opts) when is_binary(input), do: {input, %{}} |> parse(opts) |> elem(0) @@ -100,6 +102,11 @@ defmodule Linkify.Parser do end end + defp do_parse({" text, user_acc}, opts, {buffer, acc, :parsing}) do + {buffer, user_acc} = link(buffer, opts, user_acc) + do_parse({text, user_acc}, opts, {"", accumulate(acc, buffer, " text, user_acc}, opts, {buffer, acc, :parsing}), do: do_parse({text, user_acc}, opts, {"", accumulate(acc, buffer, " <>, acc, state}) def check_and_link(:url, buffer, opts, _user_acc) do - str = - buffer - |> String.split("<") - |> List.first() - |> String.replace(~r/[,.;:)>]$/, "") - |> strip_parens() - - if url?(str, opts) do - case @match_url |> Regex.run(str, capture: [:url]) |> hd() do + if url?(buffer, opts) do + case @match_url |> Regex.run(buffer, capture: [:url]) |> hd() do ^buffer -> link_url(buffer, opts) url -> - buffer - |> String.split(url) - |> Enum.intersperse(link_url(url, opts)) - |> if(opts[:iodata], do: & &1, else: &Enum.join(&1)).() + link = link_url(url, opts) + restore_stripped_symbols(buffer, url, link, opts) end else :nomatch @@ -200,19 +198,21 @@ defmodule Linkify.Parser do |> link_hashtag(buffer, opts, user_acc) end - def check_and_link(:extra, "xmpp:" <> handle, opts, _user_acc) do - if email?(handle, opts), do: link_extra("xmpp:" <> handle, opts), else: handle + def check_and_link(:extra, "xmpp:" <> handle = buffer, opts, _user_acc) do + if email?(handle, opts), do: link_extra(buffer, opts), else: :nomatch end def check_and_link(:extra, buffer, opts, _user_acc) do if String.starts_with?(buffer, @prefix_extra), do: link_extra(buffer, opts), else: :nomatch end - defp strip_parens("(" <> buffer) do - ~r/[^\)]*/ |> Regex.run(buffer) |> hd() + defp strip_parens(buffer) do + buffer + |> String.trim_leading("(") + |> String.trim_trailing(")") end - defp strip_parens(buffer), do: buffer + defp strip_punctuation(buffer), do: String.replace(buffer, @delimiters, "") def url?(buffer, opts) do valid_url?(buffer) && Regex.match?(@match_url, buffer) && valid_tld?(buffer, opts) @@ -332,10 +332,31 @@ defmodule Linkify.Parser do end defp check_and_link_reducer(type, buffer, opts, user_acc) do - case check_and_link(type, buffer, opts, user_acc) do - :nomatch -> {:cont, {buffer, user_acc}} - {buffer, user_acc} -> {:halt, {buffer, user_acc}} - buffer -> {:halt, {buffer, user_acc}} + str = + buffer + |> String.split("<") + |> List.first() + |> strip_punctuation() + |> strip_parens() + + case check_and_link(type, str, opts, user_acc) do + :nomatch -> + {:cont, {buffer, user_acc}} + + {link, user_acc} -> + {:halt, {restore_stripped_symbols(buffer, str, link, opts), user_acc}} + + link -> + {:halt, {restore_stripped_symbols(buffer, str, link, opts), user_acc}} end end + + defp restore_stripped_symbols(buffer, buffer, link, _), do: link + + defp restore_stripped_symbols(buffer, stripped_buffer, link, opts) do + buffer + |> String.split(stripped_buffer) + |> Enum.intersperse(link) + |> if(opts[:iodata], do: &Enum.reject(&1, fn el -> el == "" end), else: &Enum.join(&1)).() + end end diff --git a/test/linkify_test.exs b/test/linkify_test.exs index 9eece61..b5059f6 100644 --- a/test/linkify_test.exs +++ b/test/linkify_test.exs @@ -282,6 +282,63 @@ defmodule LinkifyTest do assert mentions |> MapSet.to_list() |> Enum.map(&elem(&1, 1)) == ["user"] end + + test "mentions handler and extra links" do + text = + "hi @user, text me asap xmpp:me@cofe.ai, (or contact me at me@cofe.ai), please.
cofe.ai." + + valid_users = ["user", "cofe"] + + handler = fn "@" <> user = mention, buffer, _opts, acc -> + if Enum.member?(valid_users, user) do + link = ~s(#{mention}) + {link, %{acc | mentions: MapSet.put(acc.mentions, {mention, user})}} + else + {buffer, acc} + end + end + + {result_text, %{mentions: mentions}} = + Linkify.link_map(text, %{mentions: MapSet.new()}, + mention: true, + mention_handler: handler, + extra: true, + email: true + ) + + assert result_text == + "hi @user, text me asap xmpp:me@cofe.ai, (or contact me at me@cofe.ai), please.
cofe.ai." + + assert MapSet.to_list(mentions) == [{"@user", "user"}] + end + + test "mentions handler and emails" do + text = "hi @friend, here is my email

user@user.me" + + valid_users = ["user", "friend"] + + handler = fn "@" <> user = mention, buffer, _opts, acc -> + if Enum.member?(valid_users, user) do + link = ~s(#{mention}) + {link, %{acc | mentions: MapSet.put(acc.mentions, {mention, user})}} + else + {buffer, acc} + end + end + + {result_text, %{mentions: mentions}} = + Linkify.link_map(text, %{mentions: MapSet.new()}, + mention: true, + mention_handler: handler, + extra: true, + email: true + ) + + assert result_text == + "hi @friend, here is my email

user@user.me" + + assert MapSet.to_list(mentions) == [{"@friend", "friend"}] + end end describe "mentions" do @@ -306,7 +363,7 @@ defmodule LinkifyTest do assert Linkify.link(text, mention: true, mention_prefix: "u/") == expected end - test "metion @user@example.com" do + test "mention @user@example.com" do text = "hey @user@example.com" expected = @@ -317,6 +374,16 @@ defmodule LinkifyTest do mention_prefix: "https://example.com/user/", new_window: true ) == expected + + text = "That's @user@example.com's server" + + expected = + "That's @user@example.com's server" + + assert Linkify.link(text, + mention: true, + mention_prefix: "https://example.com/user/" + ) == expected end end @@ -492,6 +559,12 @@ defmodule LinkifyTest do assert Linkify.link(text, extra: true) == expected end + test "wrong xmpp" do + text = "xmpp:user.example.com" + + assert Linkify.link(text, extra: true) == text + end + test "email" do text = "user@example.com" expected = "user@example.com" diff --git a/test/parser_test.exs b/test/parser_test.exs index 352f237..8692f46 100644 --- a/test/parser_test.exs +++ b/test/parser_test.exs @@ -118,8 +118,14 @@ defmodule Linkify.ParserTest do text = "google.com
" assert parse(text) == "google.com
" - text = "google.com
" - assert parse(text) == "google.com
" + text = "google.com
hey" + assert parse(text) == "google.com
hey" + + text = "hey
google.com" + assert parse(text) == "hey
google.com" + + text = "
google.com" + assert parse(text) == "
google.com" text = "google.com<" assert parse(text) == "google.com<"