X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Ftwitter_api_test.exs;h=ad932131ac2522ccf153d158368f0562ba7b4aaa;hb=8075badafe60d396c236d8d6d911cbb60ae9c5b6;hp=97657eae07e194a7619bcd1d8c5f5f17e5872f9c;hpb=73df2f8e5e2d0e2b125df8848c2dd7f2a73f1c03;p=akkoma

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 97657eae0..ad932131a 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -6,7 +6,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
 
   test "create a status" do
-    user = UserBuilder.build
+    user = UserBuilder.build(%{ap_id: "142344"})
+    _mentioned_user = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
+
     object_data = %{
       "type" => "Image",
       "url" => [
@@ -22,17 +24,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     object = Repo.insert!(%Object{data: object_data})
 
     input = %{
-      "status" => "Hello again.",
+      "status" => "Hello again, @shp.<script></script>",
       "media_ids" => [object.id]
     }
 
     { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
 
-    assert get_in(activity.data, ["object", "content"]) == "Hello again."
+    assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>."
     assert get_in(activity.data, ["object", "type"]) == "Note"
-    assert get_in(activity.data, ["actor"]) == User.ap_id(user)
+    assert get_in(activity.data, ["actor"]) == user.ap_id
     assert Enum.member?(get_in(activity.data, ["to"]), User.ap_followers(user))
     assert Enum.member?(get_in(activity.data, ["to"]), "https://www.w3.org/ns/activitystreams#Public")
+    assert Enum.member?(get_in(activity.data, ["to"]), "shp")
 
     # Add a context + 'statusnet_conversation_id'
     assert is_binary(get_in(activity.data, ["context"]))
@@ -40,11 +43,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert get_in(activity.data, ["object", "statusnetConversationId"]) == activity.id
     assert get_in(activity.data, ["statusnetConversationId"]) == activity.id
 
-    assert is_list(activity.data["attachment"])
+    assert is_list(activity.data["object"]["attachment"])
   end
 
   test "create a status that is a reply" do
-    user = UserBuilder.build
+    user = UserBuilder.build(%{ap_id: "some_cool_id"})
     input = %{
       "status" => "Hello again."
     }
@@ -64,6 +67,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert get_in(reply.data, ["object", "statusnetConversationId"]) == get_in(activity.data, ["object", "statusnetConversationId"])
     assert get_in(reply.data, ["object", "inReplyTo"]) == get_in(activity.data, ["object", "id"])
     assert get_in(reply.data, ["object", "inReplyToStatusId"]) == activity.id
+    assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id")
   end
 
   test "fetch public statuses" do
@@ -103,11 +107,13 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     { :ok, user } = UserBuilder.insert
     { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
 
-    {:ok, user, following } = TwitterAPI.follow(user, following.id)
+    {:ok, user, following, activity } = TwitterAPI.follow(user, following.id)
 
     user = Repo.get(User, user.id)
+    follow = Repo.get(Activity, activity.id)
 
     assert user.following == [User.ap_followers(following)]
+    assert follow == activity
   end
 
   test "Unfollow another user" do
@@ -141,4 +147,30 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert is_binary(response)
   end
+
+  test "it can parse mentions and return the relevant users" do
+    text = "@gsimg According to @archaeme , that is @daggsy."
+
+    {:ok, gsimg} = UserBuilder.insert(%{nickname: "gsimg"})
+    {:ok, archaeme} = UserBuilder.insert(%{nickname: "archaeme"})
+
+    expected_result = [
+      {"@gsimg", gsimg},
+      {"@archaeme", archaeme}
+    ]
+
+    assert TwitterAPI.parse_mentions(text) == expected_result
+  end
+
+  test "it adds user links to an existing text" do
+    text = "@gsimg According to @archaeme , that is @daggsy."
+
+    {:ok, _gsimg} = UserBuilder.insert(%{nickname: "gsimg", ap_id: "first_link" })
+    {:ok, _archaeme} = UserBuilder.insert(%{nickname: "archaeme", ap_id: "second_link"})
+
+    mentions = TwitterAPI.parse_mentions(text)
+    expected_text = "<a href='first_link'>@gsimg</a> According to <a href='second_link'>@archaeme</a> , that is @daggsy."
+
+    assert TwitterAPI.add_user_links(text, mentions) == expected_text
+  end
 end