diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-06-18 13:29:30 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-06-18 13:29:30 +0200 |
| commit | a9bfbcae800e88b85814c718b0c4bfa9d8dfcfaa (patch) | |
| tree | e4cfd9997ae653f26c0edb298a78fd1c02e0468f | |
| parent | 7b41e103e1146ed2912cd2c336079947fef71e9a (diff) | |
| download | pleroma-a9bfbcae800e88b85814c718b0c4bfa9d8dfcfaa.tar.gz | |
Slightly better html link regex.
| -rw-r--r-- | lib/pleroma/formatter.ex | 2 | ||||
| -rw-r--r-- | test/formatter_test.exs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 5a241fe45..50c4279f6 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -1,7 +1,7 @@ defmodule Pleroma.Formatter do alias Pleroma.User - @link_regex ~r/https?:\/\/[\w\.\/?=\-#]+[\w]/ + @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/ def linkify(text) do Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>") end diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 1e3a29e09..35625f8ff 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -6,9 +6,9 @@ defmodule Pleroma.FormatterTest do describe ".linkify" do test "turning urls into links" do - text = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufFzY." + text = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla." - expected = "Hey, check out <a href='https://www.youtube.com/watch?v=8Zg1-TufFzY'>https://www.youtube.com/watch?v=8Zg1-TufFzY</a>." + expected = "Hey, check out <a href='https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla'>https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla</a>." assert Formatter.linkify(text) == expected end |