erin/akkoma
1
0
Fork 0
forked from mirrors/akkoma
Code Activity

Slightly better html link regex.

Browse source
This commit is contained in:
Roger Braun 2017-06-18 13:29:30 +02:00
parent 7b41e103e1
commit a9bfbcae80
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/formatter.ex
View file

@ -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

4
test/formatter_test.exs
View file

@ -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