From eb7ce61ca511ac7066fbaa5795f30f48135ac224 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 24 Mar 2018 11:03:10 +0100
Subject: Fix hashtags.

---
 test/formatter_test.exs                   | 44 ++++++++++++++++++++++++++-----
 test/web/twitter_api/twitter_api_test.exs | 16 ++---------
 2 files changed, 39 insertions(+), 21 deletions(-)

(limited to 'test')

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index cb7695e8e..0e915d8d5 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -4,37 +4,67 @@ defmodule Pleroma.FormatterTest do
 
   import Pleroma.Factory
 
-  describe ".linkify" do
+  describe ".add_hashtag_links" do
+    test "turns hashtags into links" do
+      text = "I love #cofe and #2hu"
+      expected_text = "I love #<a href='http://localhost:4001/tag/cofe' rel='tag'>cofe</a> and #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a>"
+
+      tags = Formatter.parse_tags(text)
+      assert expected_text == Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize
+    end
+  end
+
+  describe ".add_links" do
     test "turning urls into links" 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>."
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
 
       text = "https://mastodon.social/@lambadalambda"
       expected = "<a href='https://mastodon.social/@lambadalambda'>https://mastodon.social/@lambadalambda</a>"
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
 
       text = "@lambadalambda"
       expected = "@lambadalambda"
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
 
       text = "http://www.cs.vu.nl/~ast/intel/"
       expected = "<a href='http://www.cs.vu.nl/~ast/intel/'>http://www.cs.vu.nl/~ast/intel/</a>"
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
 
       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>"
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
 
       text = "https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul"
       expected = "<a href='https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul'>https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul</a>"
 
-      assert Formatter.linkify(text) == expected
+      assert Formatter.add_links({[], text}) |> Formatter.finalize == expected
+    end
+  end
+
+  describe "add_user_links" do
+    test "gives a replacement for user links" do
+      text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
+      gsimg = insert(:user, %{nickname: "gsimg"})
+      archaeme = insert(:user, %{nickname: "archaeme"})
+      archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
+
+      mentions = Pleroma.Formatter.parse_mentions(text)
+
+      {subs, text} = Formatter.add_user_links({[], text}, mentions)
+
+      assert length(subs) == 3
+      Enum.each(subs, fn({uuid, _}) -> assert String.contains?(text, uuid) end)
+
+      expected_text = "<span><a href='#{gsimg.ap_id}'>@<span>gsimg</span></a></span> According to <span><a href='#{archaeme.ap_id}'>@<span>archaeme</span></a></span>, that is @daggsy. Also hello <span><a href='#{archaeme_remote.ap_id}'>@<span>archaeme</span></a></span>"
+
+      assert expected_text == Formatter.finalize({subs, text})
     end
   end
 
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 6b0b182a3..7d578a751 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -34,7 +34,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
 
-    assert get_in(activity.data, ["object", "content"]) == "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.&lt;script&gt;&lt;/script&gt;<br>This is on another :moominmamma: line. #2hu #epic #phantasmagoric<br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
+    expected_text = "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.&lt;script&gt;&lt;/script&gt;<br>This is on another :moominmamma: line. #<a href='http://localhost:4001/tag/2hu' rel='tag'>2hu</a> #<a href='http://localhost:4001/tag/epic' rel='tag'>epic</a> #<a href='http://localhost:4001/tag/phantasmagoric' rel='tag'>phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
+    assert get_in(activity.data, ["object", "content"]) == expected_text
     assert get_in(activity.data, ["object", "type"]) == "Note"
     assert get_in(activity.data, ["object", "actor"]) == user.ap_id
     assert get_in(activity.data, ["actor"]) == user.ap_id
@@ -282,19 +283,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert is_binary(response)
   end
 
-  test "it adds user links to an existing text" do
-    text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
-
-    gsimg = insert(:user, %{nickname: "gsimg"})
-    archaeme = insert(:user, %{nickname: "archaeme"})
-    archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
-
-    mentions = Pleroma.Formatter.parse_mentions(text)
-    expected_text = "<span><a href='#{gsimg.ap_id}'>@<span>gsimg</span></a></span> According to <span><a href='#{archaeme.ap_id}'>@<span>archaeme</span></a></span>, that is @daggsy. Also hello <span><a href='#{archaeme_remote.ap_id}'>@<span>archaeme</span></a></span>"
-
-    assert Utils.add_user_links(text, mentions) == expected_text
-  end
-
   test "it favorites a status, returns the updated status" do
     user = insert(:user)
     note_activity = insert(:note_activity)
-- 
cgit v1.2.3