X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fformatter_test.exs;h=97eb2f58352946c83d6e710e375e77df1da0be10;hb=0f0cc2703b7ffb99c58e72782925ea4dd61db41d;hp=7040f1c276d312c29bcb5cd379537d2b5ee80b57;hpb=2bfae25a1ff735499e15cb431314503f34097a6b;p=akkoma diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 7040f1c27..97eb2f583 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -21,22 +21,16 @@ defmodule Pleroma.FormatterTest do expected_text = "I love and " - tags = Formatter.parse_tags(text) - - assert expected_text == - Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize() + assert {^expected_text, [], _tags} = Formatter.linkify(text) end test "does not turn html characters to tags" do - text = "Fact #3: pleroma does what mastodon't" + text = "#fact_3: pleroma does what mastodon't" expected_text = - "Fact : pleroma does what mastodon't" - - tags = Formatter.parse_tags(text) + ": pleroma does what mastodon't" - assert expected_text == - Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize() + assert {^expected_text, [], _tags} = Formatter.linkify(text) end end @@ -47,84 +41,84 @@ defmodule Pleroma.FormatterTest do expected = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla ." - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://mastodon.social/@lambadalambda" expected = "https://mastodon.social/@lambadalambda" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://mastodon.social:4000/@lambadalambda" expected = "https://mastodon.social:4000/@lambadalambda" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "@lambadalambda" expected = "@lambadalambda" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "http://www.cs.vu.nl/~ast/intel/" expected = "http://www.cs.vu.nl/~ast/intel/" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://forum.zdoom.org/viewtopic.php?f=44&t=57087" expected = "https://forum.zdoom.org/viewtopic.php?f=44&t=57087" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul" expected = "https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://www.google.co.jp/search?q=Nasim+Aghdam" expected = "https://www.google.co.jp/search?q=Nasim+Aghdam" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://en.wikipedia.org/wiki/Duff's_device" expected = "https://en.wikipedia.org/wiki/Duff's_device" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "https://pleroma.com https://pleroma.com/sucks" expected = "https://pleroma.com https://pleroma.com/sucks" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) text = "xmpp:contact@hacktivis.me" expected = "xmpp:contact@hacktivis.me" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) 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 = "#{text}" - assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected + assert {^expected, [], []} = Formatter.linkify(text) end end describe "add_user_links" do - test "gives a replacement for user links" do + test "gives a replacement for user links, using local nicknames in user links text" do text = "@gsimg According to @archa_eme_, that is @daggsy. Also hello @archaeme@archae.me" gsimg = insert(:user, %{nickname: "gsimg"}) @@ -136,12 +130,9 @@ defmodule Pleroma.FormatterTest do archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) - mentions = Pleroma.Formatter.parse_mentions(text) - - {subs, text} = Formatter.add_user_links({[], text}, mentions) + {text, mentions, []} = Formatter.linkify(text) - assert length(subs) == 3 - Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end) + assert length(mentions) == 3 expected_text = "@archa_eme_, that is @daggsy. Also hello @archaeme@archae.me" + }' class='u-url mention' href='#{archaeme_remote.ap_id}'>@archaeme" - assert expected_text == Formatter.finalize({subs, text}) + assert expected_text == text end test "gives a replacement for user links when the user is using Osada" do @@ -160,48 +151,60 @@ defmodule Pleroma.FormatterTest do text = "@mike@osada.macgirvin.com test" - mentions = Formatter.parse_mentions(text) + {text, mentions, []} = Formatter.linkify(text) - {subs, text} = Formatter.add_user_links({[], text}, mentions) - - assert length(subs) == 1 - Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end) + assert length(mentions) == 1 expected_text = - "@mike@osada.macgirvin.com test" + "@mike test" - assert expected_text == Formatter.finalize({subs, text}) + assert expected_text == text end test "gives a replacement for single-character local nicknames" do text = "@o hi" o = insert(:user, %{nickname: "o"}) - mentions = Formatter.parse_mentions(text) - - {subs, text} = Formatter.add_user_links({[], text}, mentions) + {text, mentions, []} = Formatter.linkify(text) - assert length(subs) == 1 - Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end) + assert length(mentions) == 1 expected_text = "@o hi" - assert expected_text == Formatter.finalize({subs, text}) + assert expected_text == text end test "does not give a replacement for single-character local nicknames who don't exist" do text = "@a hi" - mentions = Formatter.parse_mentions(text) + expected_text = "@a hi" + assert {^expected_text, [] = _mentions, [] = _tags} = Formatter.linkify(text) + end + + test "given the 'safe_mention' option, it will only mention people in the beginning" do + user = insert(:user) + _other_user = insert(:user) + third_user = insert(:user) + text = " @#{user.nickname} hey dude i hate @#{third_user.nickname}" + {expected_text, mentions, [] = _tags} = Formatter.linkify(text, safe_mention: true) - {subs, text} = Formatter.add_user_links({[], text}, mentions) + assert mentions == [{"@#{user.nickname}", user}] - assert length(subs) == 0 - Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end) + assert expected_text == + "@#{user.nickname} hey dude i hate @#{third_user.nickname}" + end - expected_text = "@a hi" - assert expected_text == Formatter.finalize({subs, text}) + test "given the 'safe_mention' option, it will still work without any mention" do + text = "A post without any mention" + {expected_text, mentions, [] = _tags} = Formatter.linkify(text, safe_mention: true) + + assert mentions == [] + assert expected_text == text end end @@ -209,14 +212,14 @@ defmodule Pleroma.FormatterTest do test "parses tags in the text" do text = "Here's a #Test. Maybe these are #working or not. What about #漢字? And #は｡" - expected = [ + expected_tags = [ {"#Test", "test"}, {"#working", "working"}, - {"#漢字", "漢字"}, - {"#は", "は"} + {"#は", "は"}, + {"#漢字", "漢字"} ] - assert Formatter.parse_tags(text) == expected + assert {_text, [], ^expected_tags} = Formatter.linkify(text) end end @@ -230,22 +233,22 @@ defmodule Pleroma.FormatterTest do archaeme = insert(:user, %{nickname: "archaeme"}) archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) - expected_result = [ - {"@gsimg", gsimg}, + expected_mentions = [ {"@archaeme", archaeme}, {"@archaeme@archae.me", archaeme_remote}, - {"@o", o}, - {"@jimm", jimm} + {"@gsimg", gsimg}, + {"@jimm", jimm}, + {"@o", o} ] - assert Formatter.parse_mentions(text) == expected_result + assert {_text, ^expected_mentions, []} = Formatter.linkify(text) end test "it adds cool emoji" do - text = "I love :moominmamma:" + text = "I love :firefox:" expected_result = - "I love \"moominmamma\"" + "I love \"firefox\"" assert Formatter.emojify(text) == expected_result end @@ -266,9 +269,11 @@ defmodule Pleroma.FormatterTest do end test "it returns the emoji used in the text" do - text = "I love :moominmamma:" + text = "I love :firefox:" - assert Formatter.get_emoji(text) == [{"moominmamma", "/finmoji/128px/moominmamma-128.png"}] + assert Formatter.get_emoji(text) == [ + {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]} + ] end test "it returns a nice empty result when no emojis are present" do @@ -281,22 +286,10 @@ defmodule Pleroma.FormatterTest do assert Formatter.get_emoji(text) == [] end - describe "/mentions_escape" do - test "it returns text with escaped mention names" do - text = """ - @a_breakin_glass@cybre.space - (also, little voice inside my head thinking "maybe this will encourage people - pronouncing it properly instead of saying _raKEWdo_ ") - """ - - escape_text = """ - @a\\_breakin\\_glass@cybre\\.space - (also, little voice inside my head thinking \"maybe this will encourage people - pronouncing it properly instead of saying _raKEWdo_ \") - """ - - mentions = [{"@a_breakin_glass@cybre.space", %{}}] - assert Formatter.mentions_escape(text, mentions) == escape_text - end + test "it escapes HTML in plain text" do + text = "hello & world google.com/?a=b&c=d \n http://test.com/?a=b&c=d 1" + expected = "hello & world google.com/?a=b&c=d \n http://test.com/?a=b&c=d 1" + + assert Formatter.html_escape(text, "text/plain") == expected end end