projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup.
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index 515909af1bb8b00e3ceb4de8df5b08f1281b9ce5..456416fbdff4eecc6127ee9ea36bbd486cc6ecd7 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-144,7
+144,7
@@
defmodule Pleroma.Formatter do
@emoji
end
@emoji
end
- @link_regex ~r/https?:\/\/[\w\.\/?=\-#\+%&@~\(\):]+[\w\/]/u
+ @link_regex ~r/https?:\/\/[\w\.\/?=\-#\+%&@~
'
\(\):]+[\w\/]/u
def html_escape(text) do
Regex.split(@link_regex, text, include_captures: true)
def html_escape(text) do
Regex.split(@link_regex, text, include_captures: true)
@@
-168,7
+168,13
@@
defmodule Pleroma.Formatter do
subs =
subs ++
Enum.map(links, fn {uuid, url} ->
subs =
subs ++
Enum.map(links, fn {uuid, url} ->
- {uuid, "<a href='#{url}'>#{url}</a>"}
+ {:safe, link} = Phoenix.HTML.Link.link(url, to: url)
+
+ link =
+ link
+ |> IO.iodata_to_binary()
+
+ {uuid, link}
end)
{subs, uuid_text}
end)
{subs, uuid_text}