diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-28 19:20:54 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-28 19:20:54 +0000 |
| commit | ab2e5ba989720932bacf0b6c6db5dc27e762a9bb (patch) | |
| tree | d9ecd88a8bf0adc60180e4c6e266153cb47a7f98 | |
| parent | 34b6d444d61c40afe34e06980ab3566884504a2b (diff) | |
| parent | a3cffd3566495edfe823b75142524717d0b64b24 (diff) | |
| download | pleroma-ab2e5ba989720932bacf0b6c6db5dc27e762a9bb.tar.gz pleroma-ab2e5ba989720932bacf0b6c6db5dc27e762a9bb.zip | |
Merge branch 'bugfix/magnet-links' into 'develop'
formatter: Stop using phoenix HTML and format it ourselves
Closes #307
See merge request pleroma/pleroma!363
| -rw-r--r-- | lib/pleroma/formatter.ex | 8 | ||||
| -rw-r--r-- | test/formatter_test.exs | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 62f54a3f2..d5565a2ca 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -222,13 +222,7 @@ defmodule Pleroma.Formatter do subs = subs ++ Enum.map(links, fn {uuid, url} -> - {:safe, link} = Phoenix.HTML.Link.link(url, to: url) - - link = - link - |> IO.iodata_to_binary() - - {uuid, link} + {uuid, "<a href=\"#{url}\">#{url}</a>"} end) {subs, uuid_text} diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 273eefb8a..e37b17879 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -23,7 +23,7 @@ defmodule Pleroma.FormatterTest do 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-TufF%20zY?x=1&y=2#blabla\">https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla</a> ." + "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.add_links({[], text}) |> Formatter.finalize() == expected @@ -54,7 +54,7 @@ defmodule Pleroma.FormatterTest do text = "https://forum.zdoom.org/viewtopic.php?f=44&t=57087" expected = - "<a href=\"https://forum.zdoom.org/viewtopic.php?f=44&t=57087\">https://forum.zdoom.org/viewtopic.php?f=44&t=57087</a>" + "<a href=\"https://forum.zdoom.org/viewtopic.php?f=44&t=57087\">https://forum.zdoom.org/viewtopic.php?f=44&t=57087</a>" assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected @@ -75,7 +75,7 @@ defmodule Pleroma.FormatterTest do text = "https://en.wikipedia.org/wiki/Duff's_device" expected = - "<a href=\"https://en.wikipedia.org/wiki/Duff's_device\">https://en.wikipedia.org/wiki/Duff's_device</a>" + "<a href=\"https://en.wikipedia.org/wiki/Duff's_device\">https://en.wikipedia.org/wiki/Duff's_device</a>" assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected @@ -91,6 +91,13 @@ defmodule Pleroma.FormatterTest do expected = "<a href=\"xmpp:contact@hacktivis.me\">xmpp:contact@hacktivis.me</a>" assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + + text = + "magnet:?xt=urn:btih:7ec9d298e91d6e4394d1379caf073c77ff3e3136&tr=udp%3A%2F%2Fopentor.org%3A2710&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.ccc.de%3A80&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com" + + expected = "<a href=\"#{text}\">#{text}</a>" + + assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected end end |